svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00
parent 3c8d86e117 f1eb66aa68
commit 8eb41f0fdb
33 changed files with 479 additions and 339 deletions
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -458,12 +458,19 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
        layout.separator()

        layout.prop(md, "use_normals")
-
-        row = layout.row()
-        row.prop(md, "use_foam")
-        sub = row.row()
+        
+        split = layout.split()
+        
+        col = split.column()
+        col.prop(md, "use_foam")
+        sub = col.row()
        sub.active = md.use_foam
        sub.prop(md, "foam_coverage", text="Coverage")
+        
+        col = split.column()
+        col.active = md.use_foam
+        col.label("Foam Data Layer Name:")
+        col.prop(md, "foam_layer_name", text="")

        layout.separator()