Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-19 10:45:52 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-19 10:45:52 +0300
commit16fac020e07d7ad0caa5901c0740c88e9772194f (patch)
tree505cf49b33f2ce6d8edae69b7355ca1ea092aca9 /source/blender/makesdna/DNA_view3d_types.h
parent1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (diff)
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.
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h10
1 files changed, 10 insertions, 0 deletions
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 {