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>2019-03-12 04:28:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-12 04:28:01 +0300
commit022ad416702dabb2086b587d04230dd078478c04 (patch)
treefdda2e034d7b0ad54945da68d780ce9e2e6f6d1b /release/scripts/startup/bl_ui/properties_object.py
parent6b39dc7672eb463618efb5538f91961365db5797 (diff)
DRW: use object color from instancer
Otherwise it's impossible to set the color of instanced library objects. Follows convention of instancer controlling draw options.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index f6e5380591a..f8da287f231 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -257,7 +257,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
col.active = is_dupli
col.prop(obj, "display_type", text="Display As")
- if is_geometry or is_empty_image or is_gpencil:
+ if is_geometry or is_dupli or is_empty_image or is_gpencil:
# Only useful with object having faces/materials...
col = flow.column()
col.prop(obj, "color")