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 /release/scripts/startup/bl_ui/properties_collection.py | |
| 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 'release/scripts/startup/bl_ui/properties_collection.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_collection.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py index e0ac7786b50..25b4664ab83 100644 --- a/release/scripts/startup/bl_ui/properties_collection.py +++ b/release/scripts/startup/bl_ui/properties_collection.py @@ -96,6 +96,7 @@ class COLLECTION_PT_workbench_settings(CollectionButtonsPanel, Panel): collection_props = collection.engine_overrides['BLENDER_WORKBENCH'] col = layout.column() + col.template_override_property(collection_props, scene_props, "object_color_type") col.template_override_property(collection_props, scene_props, "object_color") |