Merge pull request #1368 from gforney/master

smokeview source: use clipping planes storerd with view points unless…

Author: gforney

Source/smokeview/camera.c

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

Source/smokeview/glui_clip.cpp

@@ -171,7 +171,6 @@ void ClipCB(int var){
   case SPINNER_zlower:
   case SPINNER_zupper:
     updatefacelists = 1;
-    reset_clipvals = 0;
     break;
   default:
     ASSERT(FFALSE);
@@ -204,7 +203,6 @@ 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,7 +23,6 @@
 #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);