Merge from 2.5 r21160 through r21285
[blender.git] / release / ui / buttons_physic_cloth.py
index a06c644322ad8f26e52072b356d29009108da80d..df4b84454749a25196ab8711dfca85353d913ce8 100644 (file)
@@ -97,13 +97,13 @@ class Physic_PT_cloth_collision(PhysicButtonsPanel):
        
        def draw_header(self, context):
                layout = self.layout
-               cloth = context.cloth.collision_settings
+               cloth = context.cloth.settings
        
                layout.itemR(cloth, "enable_collision", text="")
 
        def draw(self, context):
                layout = self.layout
-               cloth = context.cloth.collision_settings
+               cloth = context.cloth.settings
                
                layout.active = cloth.enable_collision  
                
@@ -151,4 +151,4 @@ class Physic_PT_cloth_stiffness(PhysicButtonsPanel):
 bpy.types.register(Physic_PT_cloth)
 bpy.types.register(PHYSICS_PT_cloth_cache)
 bpy.types.register(Physic_PT_cloth_collision)
-bpy.types.register(Physic_PT_cloth_stiffness)
+bpy.types.register(Physic_PT_cloth_stiffness)
\ No newline at end of file