Workbench: Option to use Object color

- added `object_color_type` where the user can set if the collection
determines the color, or the object will be used for the color.
Implemented it as an enum as later this can have a random color option.
- moved OB_LIGHTING_* to DNA_view3d_types and renamed it.
- Fixed some DRY in workbench_materials.c. Can remove more DRY's but
will need to discuss the responsibility of the workbench engine as it
might become part of the eevee renderer.

2 files changed, 10 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index e292e1a8456..bb17b10b299 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -446,12 +446,6 @@ 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 2b82638a6b8..ed42a2e8b71 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -74,6 +74,16 @@ typedef struct View3DDebug {
 } View3DDebug;
 
 /* ********************************* */
+enum {
+	V3D_LIGHTING_FLAT   = 0,
+	V3D_LIGHTING_STUDIO = 1,
+	V3D_LIGHTING_SCENE  = 2
+};
+
+enum {
+	V3D_OBJECT_COLOR_COLLECTION = 0,
+	V3D_OBJECT_COLOR_OBJECT     = 1,
+};
 
 typedef struct RegionView3D {