NLA SoC: Merge from 2.5
[blender.git] / release / ui / buttons_data_modifier.py
index 0f5d446f889b2f788214cb02159d4fb4d70f94dd..72b2f29100eb4ecbb1a194e4ed37e67194dbe934 100644 (file)
@@ -23,9 +23,9 @@ class DATA_PT_modifiers(DataButtonsPanel):
                row.itemL();
 
                for md in ob.modifiers:
-                       box = layout.template_modifier(md)
+                       box = layout.template_modifier(context, md)
 
-                       if box:
+                       if md.expanded:
                                if md.type == 'ARMATURE':
                                        self.armature(box, md)
                                if md.type == 'ARRAY':
@@ -103,7 +103,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
                if md.fit_type == 'FIT_LENGTH':
                        layout.itemR(md, "length")
                if md.fit_type == 'FIT_CURVE':
-                       layout.itemR(md, "curve")
+                               layout.itemR(md, "curve")
 
                layout.itemS()
                
@@ -198,7 +198,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
                layout.itemL(text="See Collision panel.")
                
        def curve(self, layout, md):
-               layout.itemR(md, "object")
+               layout.itemR(md, "curve")
                layout.itemR(md, "vertex_group")
                layout.itemR(md, "deform_axis")
                
@@ -248,7 +248,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
                # Missing: "Reset" and "Recenter"
                
        def lattice(self, layout, md):
-               layout.itemR(md, "object")
+               layout.itemR(md, "lattice")
                layout.itemR(md, "vertex_group")
                
        def mask(self, layout, md):
@@ -260,7 +260,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
                layout.itemR(md, "inverse")
                
        def mesh_deform(self, layout, md):
-               layout.itemR(md, "object")
+               layout.itemR(md, "mesh")
                layout.itemR(md, "vertex_group")
                layout.itemR(md, "invert")