Merge from V6_main 13/12/2012

[modules/paravis.git] / src / Macro / modes.py

diff --git a/src/Macro/modes.py b/src/Macro/modes.py
index db4b623bb10c7fa67313c602bf51ef20d259783f..30dc8dc7675d04316709e6fb72fc9105254c4f44 100644 (file)
--- a/src/Macro/modes.py
+++ b/src/Macro/modes.py
@@ -21,11 +21,16 @@ try: paraview.simple
 except: from paraview.simple import *
 paraview.simple._DisableFirstRenderCameraReset()
 
+import sys
+
 source = GetActiveSource()
 representation = GetDisplayProperties(source)
 representation.Visibility = 0
 
+oldmode = None
+
 if source.SMProxy.GetVTKClassName() == 'vtkMedReader' :
+  oldmode = source.AnimationMode
   source.AnimationMode = 'Modes'
 
 ExtractSurface1 = ExtractSurface()
@@ -52,6 +57,10 @@ for arrayid in range(0, pinfo.GetNumberOfArrays()) :
     WarpByVector1.Vectors = ['POINTS', rootname]
     break
 
+if vectorname == None :
+  source.AnimationMode = oldmode
+  sys.exit(0)
+
 ScaleVector1.ScaleFactor = 0
 ScaleVector1.UpdatePipeline()
 bounds = info.DataInformation.GetBounds()