diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 13:44:37 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 13:44:37 +0300 |
| commit | b0d5e74fcce929c649391a9f694ee39649a84e1c (patch) | |
| tree | 19a9d2281e4c32f8edbe50f19007225fe8f79839 /release | |
| parent | a8db1efbcf1513f7bb912c98ea9c1b7d3b333727 (diff) | |
Workbench: drawtype object color from collection to v3d
Now every 3d view can have its own solid draw color setting
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_collection.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 15 |
2 files changed, 1 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py index 25b4664ab83..8d795681d4c 100644 --- a/release/scripts/startup/bl_ui/properties_collection.py +++ b/release/scripts/startup/bl_ui/properties_collection.py @@ -87,7 +87,7 @@ class COLLECTION_PT_clay_settings(CollectionButtonsPanel, Panel): class COLLECTION_PT_workbench_settings(CollectionButtonsPanel, Panel): - bl_label = "Workbench Settings" + bl_label = "Collection Settings" def draw(self, context): layout = self.layout @@ -96,7 +96,6 @@ 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") diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index a0d7e9b1026..779a77cf7ca 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -898,20 +898,6 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): col.prop(rd, "alpha_mode", text="Alpha") -class RENDER_PT_workbench_collection_settings(RenderButtonsPanel, Panel): - bl_label = "Workbench Settings" - COMPAT_ENGINES = {'BLENDER_WORKBENCH', 'BLENDER_EEVEE', 'CYCLES'} - - def draw(self, context): - layout = self.layout - props = context.scene.collection_properties['BLENDER_WORKBENCH'] - - col = layout.column() - col.prop(props, "object_color_type") - if props.object_color_type == 'COLLECTION': - col.prop(props, "object_color") - - classes = ( RENDER_MT_presets, RENDER_MT_ffmpeg_presets, @@ -941,7 +927,6 @@ classes = ( RENDER_PT_eevee_motion_blur, RENDER_PT_eevee_depth_of_field, RENDER_PT_eevee_bloom, - RENDER_PT_workbench_collection_settings, ) if __name__ == "__main__": # only for live edit. |