*/}}
YimingWu 3 months ago
parent
commit
82487ab15d
2 changed files with 2 additions and 7 deletions
  1. 2 6
      ouroperations.c
  2. 0 1
      ourpaint.h

+ 2 - 6
ouroperations.c

@@ -1695,6 +1695,7 @@ int our_LayerImportPNG(OurLayer* l, FILE* fp, void* buf, int InputProfileMode, i
     }
 
     if(!NoEnsure){
+        LA_ACQUIRE_GLES_CONTEXT;
         our_ImageBufferToNative();
         our_LayerToTexture(l);
     }
@@ -3782,6 +3783,7 @@ int ourInit(){
 
     Our->PenID=-1;
     Our->EraserID=-1;
+    Our->BrushNumber=3;
 
     Our->RefAlpha=0.75;
     Our->RefCategory=0;
@@ -3789,12 +3791,6 @@ int ourInit(){
     tnsVectorSet3(Our->RefMargins,1.5,1.5,1.0);
     tnsVectorSet2(Our->RefPaddings,1.5,1.5);
 
-    Our->BrushNumberedThicknesses[0]=4.0f;
-    real sqrt2=sqrt(2.0f);
-    for(int i=1;i<10;i++){
-        Our->BrushNumberedThicknesses[i] = Our->BrushNumberedThicknesses[i-1] * sqrt2;
-    }
-
     tnsEnableShaderv(T->immShader);
 
     tnsVectorSet3(Our->BackgroundColor,0.2,0.2,0.2);

+ 0 - 1
ourpaint.h

@@ -400,7 +400,6 @@ STRUCTURE(OurPaint){
     real DefaultScale;
 
     int BrushNumber;
-    real BrushNumberedThicknesses[10];
     real BrushBaseSize;
     real BrushSize;
     int BrushPage;