Merge remote-tracking branch 'firemodels/master'

firemodels · Jun 22, 2023 · 11b3cc2 · 11b3cc2
2 parents 91098ba + 233a1dc
commit 11b3cc2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Source/smokeview/c_api.c b/Source/smokeview/c_api.c
@@ -813,11 +813,9 @@ void set_colorbar(size_t value) {
   iso_colorbar = colorbarinfo + iso_colorbar_index;
   update_texturebar = 1;
   UpdateListIsoColorobar();
-  selectedcolorbar_index2 = colorbartype;
   UpdateCurrentColorbar(colorbarinfo + colorbartype);
   UpdateColorbarType();
-  UpdateColorbarList2();
-  if (colorbartype == bw_colorbar_index) {
+  if (colorbartype == bw_colorbar_index && bw_colorbar_index >= 0) {
     setbwdata = 1;
   } else {
     setbwdata = 0;
@@ -933,8 +931,12 @@ void ImmersedMenu(int value);
 void BlockageMenu(int value);
 void blockages_hide_all() { BlockageMenu(visBLOCKHide); }
 // TODO: clarify behaviour under isZoneFireModel
-void outlines_hide() { if(isZoneFireModel==0)visFrame=1-visFrame;}
-void outlines_show() { if(isZoneFireModel==0)visFrame=1-visFrame; }
+void outlines_hide() {
+  if (isZoneFireModel == 0) visFrame = 1 - visFrame;
+}
+void outlines_show() {
+  if (isZoneFireModel == 0) visFrame = 1 - visFrame;
+}
 
 void surfaces_hide_all() {
   visVents = 0;