diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-07-24 09:21:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-07-24 09:21:47 +0300 |
commit | 1a5945e2c3c4d0efca2eb0329d2a574795bb9ef2 (patch) | |
tree | 0bcfbdadc78e7b5632a1c1fd49436b4bfad2321f /release/scripts/startup/bl_ui | |
parent | 2a186af2b3888f393144919b0c2440e8c77dbf05 (diff) | |
parent | 2bd2db120ec901d740701b713a065662e7d4e6d8 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 8ce53ed30eb..b142f6085fa 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -212,7 +212,6 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): layout = self.layout layout.use_property_split = True - obj = context.object obj_type = obj.type is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'VOLUME', 'HAIR', 'POINTCLOUD'}) @@ -237,10 +236,11 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col.prop(obj, "show_in_front", text="In Front") # if obj_type == 'MESH' or is_empty_image: # col.prop(obj, "show_transparent", text="Transparency") + sub = layout.column() if is_wire: # wire objects only use the max. display type for duplis - col.active = is_dupli - col.prop(obj, "display_type", text="Display As") + sub.active = is_dupli + sub.prop(obj, "display_type", text="Display As") if is_geometry or is_dupli or is_empty_image or is_gpencil: # Only useful with object having faces/materials... |