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>2014-03-13 19:13:31 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-13 19:15:18 +0400
commita349a3a94ecf6413f2ef62c872fdefda010df597 (patch)
tree29f122846c0a78b763313e96945e166c488a5397 /release
parentf959e3d4bac148d95e3bc1dad481628b0fe1a994 (diff)
UI: Show edge draw options for duplis, it applied to their instances
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 8d7f5cfdad1..b0872f47ea6 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -207,16 +207,18 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
obj_type = obj.type
is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'})
is_empty_image = (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE')
+ is_dupli = (obj.dupli_type != 'NONE')
split = layout.split()
col = split.column()
col.prop(obj, "show_name", text="Name")
col.prop(obj, "show_axis", text="Axis")
- if is_geometry:
- # Makes no sense for cameras, armatures, etc.!
+ # Makes no sense for cameras, armatures, etc.!
+ # but these settings do apply to dupli instances
+ if is_geometry or is_dupli:
col.prop(obj, "show_wire", text="Wire")
- if obj_type == 'MESH':
+ if obj_type == 'MESH' or is_dupli:
col.prop(obj, "show_all_edges")
col = split.column()