diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 10:45:52 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 10:45:52 +0300 |
| commit | 16fac020e07d7ad0caa5901c0740c88e9772194f (patch) | |
| tree | 505cf49b33f2ce6d8edae69b7355ca1ea092aca9 /source/blender/makesdna/DNA_object_types.h | |
| parent | 1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (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_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 0 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, |