Merge branch 'master' into gui-misc-C

Author: dcwhite

src/Core/Algorithms/Visualization/RenderFieldState.h

@@ -60,10 +60,16 @@ class SCISHARE RenderState
     // Node flags
     USE_SPHERE,
     USE_TRANSPARENT_NODES,
+    USE_DEFAULT_COLOR_NODES,
+    USE_COLORMAP_ON_NODES,
+    USE_COLOR_CONVERT_ON_NODES,
 
     // Edge flags
     USE_CYLINDER,
     USE_TRANSPARENT_EDGES,
+    USE_DEFAULT_COLOR_EDGES,
+    USE_COLORMAP_ON_EDGES,
+    USE_COLOR_CONVERT_ON_EDGES,
 
     // Face flags
     USE_NORMALS,