Merge commit '0e1e9466' into release

Rendering/Core/vtkVolumeProperty.cxx

@@ -475,13 +475,12 @@ void vtkVolumeProperty::SetComponentWeight(int index, double value)
     return;
   }
 
-  if (this->ComponentWeight[index] == value)
+  double val = value < 0.0 ? 0.0 : (value > 1.0 ? 1.0 : value);
+  if (this->ComponentWeight[index] != val)
   {
-    return;
+    this->ComponentWeight[index] = val;
+    this->Modified();
   }
-
-  this->ComponentWeight[index] = value;
-  this->Modified();
 }
 
 double vtkVolumeProperty::GetComponentWeight(int index)

Rendering/Core/vtkVolumeProperty.h

@@ -109,7 +109,8 @@ public:
 
   //@{
   /**
-   * Set/Get the scalar component weights
+   * Set/Get the scalar component weights.
+   * Clamped between the range of (0.0, 1.0)
    */
   virtual void SetComponentWeight(int index, double value);
   virtual double GetComponentWeight(int index);