Merge pull request #1367 from gforney/master

preserve clipping state when changing viewpoints

Author: gforney

Source/smokeview/camera.c

@@ -325,7 +325,7 @@ void CopyCamera(cameradata *to, cameradata *from){
     UpdateGluiZoom();
   }
   to->dirty=1;
-  if(to==camera_current&&updateclipvals==0){
+  if(to == camera_current && updateclipvals == 0 && reset_clipvals == 1){
     Cam2Clip(camera_current);
   }
   if(to==camera_current&&to->quat_defined==1){

Source/smokeview/glui_clip.cpp

@@ -171,6 +171,7 @@ void ClipCB(int var){
   case SPINNER_zlower:
   case SPINNER_zupper:
     updatefacelists = 1;
+    reset_clipvals = 0;
     break;
   default:
     ASSERT(FFALSE);
@@ -203,6 +204,7 @@ void ClipCB(int var){
     camera_current->ymax = clipinfo.ymax;
     camera_current->zmin = clipinfo.zmin;
     camera_current->zmax = clipinfo.zmax;
+    reset_clipvals = 0;
     break;
   default:
     ASSERT(FFALSE);

Source/smokeview/smokeviewvars.h

@@ -23,6 +23,7 @@
 #include "glutbitmap.h"
 #endif
 
+SVEXTERN int SVDECL(reset_clipvals, 1);
 SVEXTERN int SVDECL(update_slicexyz, 0);
 SVEXTERN int SVDECL(update_splitcolorbar, 0);
 SVEXTERN int SVDECL(slice_plot_bound_option, 1);