*/}}
Browse Source

small fixes

YimingWu 2 weeks ago
parent
commit
fd0031bb97
2 changed files with 3 additions and 2 deletions
  1. 1 0
      la_tns.h
  2. 2 2
      resources/la_widgets.c

+ 1 - 0
la_tns.h

@@ -928,6 +928,7 @@ STRUCTURE(tnsEdgeHash){
 
 void tnsSetuptnsFontManager();
 
+char* tnsEnsureShaderCommoms(char* Content, char* Library, char* Material);
 tnsShader *tnsNewShaderProgram(int VertexShaderID, int FragmentShaderID, int GeometryShaderID);
 int tnsNewGeometryShader(char *Content);
 int tnsNewFragmentShader(char *Content);

+ 2 - 2
resources/la_widgets.c

@@ -2725,14 +2725,14 @@ int OPMOD_EnumSelector(laOperator *a, laEvent *e){
             ei = ei->Item.pNext?ei->Item.pNext:((laEnumProp*)ui->PP.LastPs->p)->Items.pFirst;
             if(IsMomentary){  uit->On = 1; if(e->type==LA_L_MOUSE_UP){ ei = ei=((laEnumProp*)ui->PP.LastPs->p)->Items.pFirst; uit->On = 0;} }
             laSetEnumArrayIndexed(&ui->PP, ArrTarget, ei->Index);
-            if(!LA_UI_FLAGS_NO_CONFIRM){ laConfirmInt(a,EnumTarget,LA_CONFIRM_DATA); }
+            if(!NoConfirm){ laConfirmInt(a,EnumTarget,LA_CONFIRM_DATA); }
             laRecordAndPushProp(&ui->PP,0); laMarkPropChanged(&ui->PP);
             if(ui->Flags&LA_UI_FLAGS_EXIT_WHEN_TRIGGERED) return LA_FINISHED;
         }else{
             if(ArrTarget>=ArrLen){ArrTarget=ArrLen-1;} 
             if(EnumTarget>=EnumLen){EnumTarget=EnumLen-1;}
             laSetEnumArrayIndexedExternal(&ui->PP, ArrTarget, EnumTarget);
-            if(!LA_UI_FLAGS_NO_CONFIRM){ laConfirmInt(a,EnumTarget,LA_CONFIRM_DATA); }
+            if(!NoConfirm){ laConfirmInt(a,EnumTarget,LA_CONFIRM_DATA); }
             laRecordAndPushProp(&ui->PP,0); laMarkPropChanged(&ui->PP);
             return LA_RUNNING_PASS;
         }