BUG: Restored availability of VTK_USE_HYBRID and VTK_USE_VOLUMERENDERING to...

BUG: Restored availability of VTK_USE_HYBRID and VTK_USE_VOLUMERENDERING to outside projects in both CMake and C++ code.  Their values are now copied from VTK_USE_RENDERING.

VTKConfig.cmake.in

@@ -81,6 +81,10 @@ SET(VTK_WRAP_TCL "@VTK_WRAP_TCL@")
 SET(VTK_LEGACY_REMOVE "@VTK_LEGACY_REMOVE@")
 SET(VTK_LEGACY_SILENT "@VTK_LEGACY_SILENT@")
 
+# The Hybrid and VolumeRendering kits are now switched with Rendering.
+SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@")
+SET(VTK_USE_VOLUMERENDERING "@VTK_USE_RENDERING@")
+
 SET(VTK_TK_RESOURCE_FILE "@VTK_TK_RESOURCE_FILE@")
 SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@")
 SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@")

vtkToolkits.h.in

@@ -24,6 +24,12 @@
 #cmakedefine VTK_USE_RENDERING
 #cmakedefine VTK_USE_GL2PS
 
+/* The Hybrid and VolumeRendering kits are now switched with Rendering.  */
+#ifdef VTK_USE_RENDERING
+# define VTK_USE_HYBRID
+# define VTK_USE_VOLUMERENDERING
+#endif
+
 /*--------------------------------------------------------------------------*/
 /* Rendering Configuration                                                  */