From 69828cba533d486d3c00578cd0bd03a5e2b8d1c6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 22 Jan 2020 17:43:15 +1100 Subject: UI: rename transparency to opacity Calling it transparency makes value seem inverted, resolves T73306. --- release/scripts/startup/bl_ui/properties_data_empty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/properties_data_empty.py') diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index 4ce87b85410..dc9c170c65b 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -49,7 +49,7 @@ class DATA_PT_empty(DataButtonsPanel, Panel): col = layout.column() col.active = ob.use_empty_image_alpha - col.prop(ob, "color", text="Transparency", index=3, slider=True) + col.prop(ob, "color", text="Opacity", index=3, slider=True) col = layout.column(align=True) col.prop(ob, "empty_image_offset", text="Offset X", index=0) -- cgit v1.2.3 From acb576c762d46d945e1bafe85d3f166c6c07955b Mon Sep 17 00:00:00 2001 From: William Reynish Date: Tue, 28 Jan 2020 10:25:46 +0100 Subject: UI: Empty image Properties layout tweaks - Enable decorators - Use sub-panel for transparency Differential Revision: https://developer.blender.org/D6692 Reviewed by Brecht van Lommel --- .../scripts/startup/bl_ui/properties_data_empty.py | 36 ++++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'release/scripts/startup/bl_ui/properties_data_empty.py') diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index dc9c170c65b..d686c55407a 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -37,7 +37,6 @@ class DATA_PT_empty(DataButtonsPanel, Panel): def draw(self, context): layout = self.layout layout.use_property_split = True - layout.use_property_decorate = False ob = context.object @@ -45,12 +44,6 @@ class DATA_PT_empty(DataButtonsPanel, Panel): layout.prop(ob, "empty_display_size", text="Size") if ob.empty_display_type == 'IMAGE': - layout.prop(ob, "use_empty_image_alpha") - - col = layout.column() - col.active = ob.use_empty_image_alpha - col.prop(ob, "color", text="Opacity", index=3, slider=True) - col = layout.column(align=True) col.prop(ob, "empty_image_offset", text="Offset X", index=0) col.prop(ob, "empty_image_offset", text="Y", index=1) @@ -58,11 +51,32 @@ class DATA_PT_empty(DataButtonsPanel, Panel): col = layout.column() col.row().prop(ob, "empty_image_depth", text="Depth", expand=True) col.row().prop(ob, "empty_image_side", text="Side", expand=True) - col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic") - col.prop(ob, "show_empty_image_perspective", text="Display Perspective") + col.prop(ob, "show_empty_image_orthographic", + text="Display Orthographic") + col.prop(ob, "show_empty_image_perspective", + text="Display Perspective") col.prop(ob, "show_empty_image_only_axis_aligned") +class DATA_PT_empty_alpha(DataButtonsPanel, Panel): + bl_label = "Transparency" + bl_parent_id = "DATA_PT_empty" + + def draw_header(self, context): + ob = context.object + + self.layout.prop(ob, "use_empty_image_alpha", text="") + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + ob = context.object + + layout.active = ob.use_empty_image_alpha + layout.prop(ob, "color", text="Opacity", index=3, slider=True) + + class DATA_PT_empty_image(DataButtonsPanel, Panel): bl_label = "Image" @@ -74,13 +88,15 @@ class DATA_PT_empty_image(DataButtonsPanel, Panel): def draw(self, context): layout = self.layout ob = context.object - layout.template_ID(ob, "data", open="image.open", unlink="object.unlink_data") + layout.template_ID(ob, "data", open="image.open", + unlink="object.unlink_data") layout.separator() layout.template_image(ob, "data", ob.image_user, compact=True) classes = ( DATA_PT_empty, + DATA_PT_empty_alpha, DATA_PT_empty_image, ) -- cgit v1.2.3 From deb5b00e1b1928bb841838f7eccc11bfa0c1c4fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 29 Jan 2020 11:11:09 +1100 Subject: Cleanup: revert wrapping from D6692 --- release/scripts/startup/bl_ui/properties_data_empty.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'release/scripts/startup/bl_ui/properties_data_empty.py') diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index d686c55407a..72946ed1268 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -51,10 +51,8 @@ class DATA_PT_empty(DataButtonsPanel, Panel): col = layout.column() col.row().prop(ob, "empty_image_depth", text="Depth", expand=True) col.row().prop(ob, "empty_image_side", text="Side", expand=True) - col.prop(ob, "show_empty_image_orthographic", - text="Display Orthographic") - col.prop(ob, "show_empty_image_perspective", - text="Display Perspective") + col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic") + col.prop(ob, "show_empty_image_perspective", text="Display Perspective") col.prop(ob, "show_empty_image_only_axis_aligned") @@ -88,8 +86,7 @@ class DATA_PT_empty_image(DataButtonsPanel, Panel): def draw(self, context): layout = self.layout ob = context.object - layout.template_ID(ob, "data", open="image.open", - unlink="object.unlink_data") + layout.template_ID(ob, "data", open="image.open", unlink="object.unlink_data") layout.separator() layout.template_image(ob, "data", ob.image_user, compact=True) -- cgit v1.2.3 From fd959bf658c36eebad32fd4d2cfa493f30eda4ea Mon Sep 17 00:00:00 2001 From: William Reynish Date: Thu, 30 Jan 2020 17:18:07 +0100 Subject: Fix unreported: Missing Empty Transparency panel poll Own mistake in recent change --- release/scripts/startup/bl_ui/properties_data_empty.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'release/scripts/startup/bl_ui/properties_data_empty.py') diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index 72946ed1268..88fdaae0433 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -60,6 +60,11 @@ class DATA_PT_empty_alpha(DataButtonsPanel, Panel): bl_label = "Transparency" bl_parent_id = "DATA_PT_empty" + @classmethod + def poll(cls, context): + ob = context.object + return (ob and ob.type == 'EMPTY' and ob.empty_display_type == 'IMAGE') + def draw_header(self, context): ob = context.object -- cgit v1.2.3