*/}}
Browse Source

Some modelling bug fixes

YimingWu 1 year ago
parent
commit
6604bf9aaf
3 changed files with 3 additions and 3 deletions
  1. 1 1
      la_tns_kernel.c
  2. 1 1
      la_tns_mesh.c
  3. 1 1
      resources/la_modelling.c

+ 1 - 1
la_tns_kernel.c

@@ -240,7 +240,7 @@ LA_SHADER_LIB_FXAA
     float d=dot(uViewDir,normalize(fViewDir));\n\
     float target=cos(uFOV/2.);\n\
     vec4 color=vec4(1.,1.,1.,1.); float mul=0.;\n\
-    if(d<(target+0.005)&&d>target) mul=1.0;\n\
+    //if(d<(target+0.005)&&d>target) mul=1.0;\n\
     vec2 uv=gl_FragCoord.xy/textureSize(TexColor,0);\n\
     vec4 buffer_color=fxaa(TexColor,uv,textureSize(TexColor,0));\n\
     //vec4 buffer_color=texture2D(TexColor,uv);\n\

+ 1 - 1
la_tns_mesh.c

@@ -499,7 +499,7 @@ void tnsMMeshRefreshIndex(tnsMeshObject* mo){
 void tnsClearMesh(tnsMeshObject* mo){
     arrFree(&mo->v, &mo->maxv); mo->totv=0;
     arrFree(&mo->e, &mo->maxe); mo->tote=0;
-    for(int i=0;i<mo->totf;i++){ if(mo->f[i].loop) free(mo->f[i].loop); }
+    if(mo->f) for(int i=0;i<mo->totf;i++){ if(mo->f[i].loop) free(mo->f[i].loop); }
     arrFree(&mo->f, &mo->maxf); mo->totf=0;
 }
 void tnsClearMMesh(tnsMeshObject* mo){

+ 1 - 1
resources/la_modelling.c

@@ -1152,7 +1152,7 @@ int OPINV_Add(laOperator *a, laEvent *e){
     tnsObject*root=ui?ui->PP.EndInstance:0; if(!root) return 0;
     tnsMeshObject* mo=root->Active; int ran=0; tnsObject* no=0;
     
-    if(mo->Base.Type!=TNS_OBJECT_MESH || mo->Mode!=TNS_MESH_EDIT_MODE){
+    if((!mo) || mo->Base.Type!=TNS_OBJECT_MESH || mo->Mode!=TNS_MESH_EDIT_MODE){
         if(strSame(strGetArgumentString(a->ExtraInstructionsP, "mode"),"PLANE")){ tnsDeselectAllObjects(root); 
             no=tnsCreateMeshPlane(root, "Plane",0,0,0,10); no->Flags|=TNS_OBJECT_FLAGS_SELECTED; memAssignRef(root,&root->Active,no); ran=1; }
         else{ laEnableOperatorPanel(a,a->This,e->x,e->y,200,200,0,0,0,0,0,0,0,0,e); return LA_RUNNING; }