blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Campbell Barton 2020-07-24 16:21:47 +10:00
parent 2a186af2b3 2bd2db120e
commit 1a5945e2c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/properties_object.py
View File

@ -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...