[Bf-blender-cvs] [c9c0d11] master: Fix T37929: inherit scale for dupli faces was not shown greyed out when it should be.

[Brecht Van Lommel]

Commit: c9c0d11f2ada314868a806f4884b2d12058e75bf
Author: Brecht Van Lommel
Date:   Mon Dec 23 16:27:43 2013 +0100
http://developer.blender.org/rBc9c0d11f2ada314868a806f4884b2d12058e75bf

Fix T37929: inherit scale for dupli faces was not shown greyed out when it should be.

===================================================================

M	release/scripts/startup/bl_ui/properties_object.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index cbebdaf..da74031 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")