Merge branch 'master' into agy/NewPV1_For_850

diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index c75e35d7898e3aa996123358d8d10b5912381ae2..955849c948c1fdb08230fe1c39fd8971d6a65941 100755 (executable)
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -396,8 +396,7 @@ SVTK_Recorder
     return;
   }
   myFilter->UpdateInformation();
-  myFilter->SetUpdateExtentToWholeExtent();
-  myFilter->Update();
+  myFilter->UpdateWholeExtent();
 }
 
 

diff --git a/src/VTKViewer/VTKViewer_Texture.cxx b/src/VTKViewer/VTKViewer_Texture.cxx
index 7b20cd5e167f49139a8eafb3db0d57712d8ab828..c6faba0b19e009aaeccf64bc1e0a7a1333969567 100644 (file)
--- a/src/VTKViewer/VTKViewer_Texture.cxx
+++ b/src/VTKViewer/VTKViewer_Texture.cxx
@@ -534,7 +534,7 @@ void VTKViewer_Texture::Load(vtkRenderer *ren)
 
       // make sure using unsigned char data of color scalars type
       if (this->IsDepthTexture != 1 &&
-        (this->MapColorScalarsThroughLookupTable ||
+        (this->ColorMode ||
          scalars->GetDataType() != VTK_UNSIGNED_CHAR ))
         {
         dataPtr = this->MapScalarsToColors (scalars);