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:
authorLukas Tönne <lukas.toenne@gmail.com>2014-05-13 10:52:51 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-05-13 10:55:36 +0400
commit35833662660caf2949bb69de764934d7c03dc901 (patch)
treed1b7c0aa2cf5d72094943a563342584a58beb38b /release
parentbdf477d19a92b210aafc7a4d1d09b46717538ffd (diff)
Show the "Maximum Draw Type" for empties and cameras in case they work
as duplicators. This property was always hidden in the UI for empties and cameras. It doesn't make sense for the objects themselves (they are wires-only), but also gets inherited by duplis. Now show it greyed out if not used, but make it available for duplicators.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 3ff9ab9e12f..6b7e7b47281 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -206,6 +206,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
obj = context.object
obj_type = obj.type
is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'})
+ is_wire = (obj_type in {'CAMERA', 'EMPTY'})
is_empty_image = (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE')
is_dupli = (obj.dupli_type != 'NONE')
@@ -237,9 +238,13 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
split = layout.split()
col = split.column()
- if obj_type not in {'CAMERA', 'EMPTY'}:
+ if is_wire:
+ # wire objects only use the max. draw type for duplis
+ col.active = is_dupli
+ col.label(text="Maximum Dupli Draw Type:")
+ else:
col.label(text="Maximum Draw Type:")
- col.prop(obj, "draw_type", text="")
+ col.prop(obj, "draw_type", text="")
col = split.column()
if is_geometry or is_empty_image: