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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-23 19:27:43 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-23 19:27:43 +0400
commitc9c0d11f2ada314868a806f4884b2d12058e75bf (patch)
tree0ef301a58d4b8778d466372a9af66acfaf06004a
parent6c1525c99f1f3572d8afaef96707712d39c45588 (diff)
Fix T37929: inherit scale for dupli faces was not shown greyed out when it should be.
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index cbebdafbf2e..da7403176b1 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -275,7 +275,9 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
elif ob.dupli_type == 'FACES':
row = layout.row()
row.prop(ob, "use_dupli_faces_scale", text="Scale")
- row.prop(ob, "dupli_faces_scale", text="Inherit Scale")
+ sub = row.row()
+ sub.active = ob.use_dupli_faces_scale
+ sub.prop(ob, "dupli_faces_scale", text="Inherit Scale")
elif ob.dupli_type == 'GROUP':
layout.prop(ob, "dupli_group", text="Group")