*/}}
فهرست منبع

Our paint init

Yiming Wu 2 سال پیش
والد
کامیت
6a1e07ee07
3فایلهای تغییر یافته به همراه6 افزوده شده و 5 حذف شده
  1. 1 1
      source/lagui/la_kernel.c
  2. 3 3
      source/lagui/la_tns_kernel.c
  3. 2 1
      source/lagui/resources/la_widgets_viewers.c

+ 1 - 1
source/lagui/la_kernel.c

@@ -433,7 +433,7 @@ void laShutoff(){
     tnsQuit();
 
     laPropContainer* pc; while(pc=lstPopItem(&MAIN.PropContainers)){ la_FreePropertyContainer(pc); }
-    laPanel* p; while(p=lstPopItem(&MAIN.WastedPanels)){ memFree(p); }
+    //laPanel* p; while(p=lstPopItem(&MAIN.WastedPanels)){ memFree(p); }
 
     strSafeDump();
 

+ 3 - 3
source/lagui/la_tns_kernel.c

@@ -1906,14 +1906,14 @@ void tnsReconfigureTextureParameters(int Multisample){
 }
 
 tnsTexture *tnsCreate2DTexture(GLint glInternalFormat, int w, int h, int Multisample){
-    tnsTexture *tex = CreateNew(tnsTexture);
+    tnsTexture *tex = memAcquire(sizeof(tnsTexture));
     tnsInit2DTexture(tex, glInternalFormat, w, h, Multisample);
     laNotifyUsers("tns.texture_list");
     lstAppendItem(tKnlGetTextureList(), tex);
     return tex;
 };
 tnsTexture *tnsCreate3DTexture(GLint glInternalFormat, int w, int h, int slices){
-    tnsTexture *tex = CreateNew(tnsTexture);
+    tnsTexture *tex = memAcquire(sizeof(tnsTexture));
     tnsInit3DTexture(tex, glInternalFormat, w, h, slices);
     laNotifyUsers("tns.texture_list");
     lstAppendItem(tKnlGetTextureList(), tex);
@@ -2031,7 +2031,7 @@ void tnsDeleteTexture(tnsTexture *t){
     laNotifyUsers("tns.texture_list");
     lstRemoveItem(lst, t);
     if (t->DrawData) FreeMem(t->DrawData);
-    FreeMem(t);
+    memFree(t);
 }
 
 int tnsTextureMemorySize(tnsTexture *t, int Mem){

+ 2 - 1
source/lagui/resources/la_widgets_viewers.c

@@ -791,7 +791,8 @@ int OPMOD_3DViewCameraMove(laOperator *a, laEvent *e){
 }
 
 int OPCHK_Is2DViewExtra(laPropPack *This, laStringSplitor *ss){
-    if (This && (This->LastPs->p->SubProp == _LA_PROP_2D_EXTRA)) return 1;
+    return 1;
+    //if (This && (This->LastPs->p->SubProp == _LA_PROP_2D_EXTRA)) return 1;
     return 0;
 }
 int OPINV_CanvasZoom(laOperator *a, laEvent *e){