Workbench: clean up the viewport shading code

- added the drawtype_solid, drawtype_wireframe, drawtype_texture to
View3D
- enabled workbench panels for important render engines
- merged workbench_materials to solid_flat_mode. All draw modes will get
its own fast implementation in the workbench

2 files changed, 12 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index bb17b10b299..e292e1a8456 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -446,6 +446,12 @@ enum {
 	OB_PAINT     = 100,  /* temporary used in draw code */
 };
 
+enum {
+	OB_LIGHTING_FLAT   = 0,
+	OB_LIGHTING_STUDIO = 1,
+	OB_LIGHTING_SCENE  = 2
+};
+
 /* dtx: flags (short) */
 enum {
 	OB_DRAWBOUNDOX    = 1 << 0,
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index cc0389ec568..70d0d8c9d4d 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -238,8 +238,12 @@ typedef struct View3D {
 	 * Runtime-only, set in the rendered viewport toggle operator.
 	 */
 	short prev_drawtype;
-	short pad1;
-	float pad2;
+	/* drawtype subtype (visibility) used when drawtype == OB_WIRE */
+	short drawtype_wireframe;
+	/* drawtype subtype (lighting) used when drawtype == OB_SOLID */
+	short drawtype_solid;
+	/* drawtype subtype (lighting) used when drawtype == OB_TEXTURE */
+	short drawtype_texture;
 	View3DDebug debug;
 } View3D;