diff --git a/Build/for_bundle/smokeview.ini b/Build/for_bundle/smokeview.ini index 695b21286..3fa5208e1 100644 --- a/Build/for_bundle/smokeview.ini +++ b/Build/for_bundle/smokeview.ini @@ -350,7 +350,7 @@ SHOWTRACERSALWAYS SHOWTRANSPARENT 0 SHOWTRIANGLES - 1 1 0 0 1 1 1 + 1 0 0 0 1 1 1 SHOWTRANSPARENTVENTS 1 SHOWTRIANGLECOUNT diff --git a/Source/smokeview/glui_bounds.cpp b/Source/smokeview/glui_bounds.cpp index 17f4b2f79..f12320b70 100644 --- a/Source/smokeview/glui_bounds.cpp +++ b/Source/smokeview/glui_bounds.cpp @@ -2178,9 +2178,9 @@ extern "C" void GLUIPartBoundsCPP_CB(int var){ } } -/* ------------------ HavePatchData ------------------------ */ +/* ------------------ HaveAnyPatchData ------------------------ */ -int HavePatchData(void){ +int HaveAnyPatchData(void){ int i; for(i = 0; iblocknumber; - if(meshi->patchval==NULL||meshi->cpatchval==NULL)return 0; + if(meshi->patchval!=NULL||meshi->cpatchval!=NULL)return 1; break; case PATCH_GEOMETRY_BOUNDARY: - if(patchi->geom_vals==NULL)return 0; + if(patchi->geom_vals!=NULL)return 1; break; case PATCH_GEOMETRY_SLICE: break; @@ -2205,7 +2205,7 @@ int HavePatchData(void){ break; } } - return 1; + return 0; } /* ------------------ patch callback: GLUIPatchBoundsCPP_CB ------------------------ */ @@ -2252,7 +2252,7 @@ extern "C" void GLUIPatchBoundsCPP_CB(int var){ break; case BOUND_DONTUPDATE_COLORS: case BOUND_UPDATE_COLORS: - if(HavePatchData()==1){ + if(HaveAnyPatchData()==1){ SetLoadedPatchBounds(NULL, 0); if(var==BOUND_DONTUPDATE_COLORS){ UpdateAllBoundaryColors(0); @@ -2261,9 +2261,6 @@ extern "C" void GLUIPatchBoundsCPP_CB(int var){ UpdateAllBoundaryColors(1); } } - else{ - GLUIPatchBoundsCPP_CB(BOUND_RELOAD_DATA); - } break; case BOUND_RELOAD_DATA: SetLoadedPatchBounds(NULL, 0); diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h index 1f0884e2a..23571ed71 100644 --- a/Source/smokeview/smokeviewvars.h +++ b/Source/smokeview/smokeviewvars.h @@ -828,7 +828,7 @@ SVEXTERN int SVDECL(show_boundary_outline, 0); SVEXTERN int SVDECL(show_boundary_points, 0); SVEXTERN int SVDECL(show_iso_shaded,1); -SVEXTERN int SVDECL(show_iso_outline,1); +SVEXTERN int SVDECL(show_iso_outline,0); SVEXTERN int SVDECL(show_iso_points,0); SVEXTERN int SVDECL(show_faces_shaded, 1);