Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-07-24 09:20:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-07-24 09:20:30 +0300
commit2bd2db120ec901d740701b713a065662e7d4e6d8 (patch)
treef4f5ce0d4eb920c80c3746e88e5aa00b5fa4f1e7 /release/scripts/startup/bl_ui/properties_object.py
parent0e9999a93edd3c8d62688e03340d9687ca6ce953 (diff)
Fix T79209: Empties have disabled viewport display settings
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py6
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...