Merged changes in the trunk up to revision 27779.

4 files changed, 11 insertions, 11 deletions

diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
index b91c7d4372c..8bf1617c124 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/ui/properties_data_modifier.py
@@ -507,7 +507,8 @@ class DATA_PT_modifiers(DataButtonsPanel):
         col.prop(md, "steps")
         col.prop(md, "render_steps")
         
-        col = split.column()
+        if wide_ui:
+            col = split.column()
         row = col.row()
         row.active = (md.object is None or md.use_object_screw_offset == False)
         row.prop(md, "screw_offset")
diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py
index 73f0a6fe5c2..d83253bf771 100644
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/ui/properties_object.py
@@ -268,9 +268,10 @@ class OBJECT_PT_duplication(ObjectButtonsPanel):
             else:
                 layout.prop(ob, "dupli_group", text="")
 
-
+# XXX: the following options are all quite buggy, ancient hacks that should be dropped
 class OBJECT_PT_animation(ObjectButtonsPanel):
-    bl_label = "Animation"
+    bl_label = "Animation Hacks"
+    bl_default_closed = True
 
     def draw(self, context):
         layout = self.layout
@@ -293,16 +294,13 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
         row.prop(ob, "slow_parent")
         row.active = (ob.parent is not None)
         col.prop(ob, "time_offset", text="Offset")
-
+		
+        # XXX: these are still used for a few curve-related tracking features
         if wide_ui:
             col = split.column()
-        col.label(text="Track:")
-        col.prop(ob, "track", text="")
+        col.label(text="Tracking Axes:")
         col.prop(ob, "track_axis", text="Axis")
         col.prop(ob, "up_axis", text="Up Axis")
-        row = col.row()
-        row.prop(ob, "track_override_parent", text="Override Parent")
-        row.active = (ob.parent is not None)
 
 
 # import generic panels from other files
@@ -316,7 +314,7 @@ classes = [
     OBJECT_PT_groups,
     OBJECT_PT_display,
     OBJECT_PT_duplication,
-    OBJECT_PT_animation,
+    OBJECT_PT_animation, # XXX: panel of old hacks pending to be removed...
 
     OBJECT_PT_motion_paths,
     #OBJECT_PT_onion_skinning,
diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py
index 7a65420e172..22a83e02ba7 100644
--- a/release/scripts/ui/properties_physics_cloth.py
+++ b/release/scripts/ui/properties_physics_cloth.py
@@ -179,6 +179,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
         sub.prop(cloth, "self_collision_quality", slider=True, text="Quality")
         sub.prop(cloth, "self_min_distance", slider=True, text="Distance")
 
+        layout.prop(cloth, "group")
 
 class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
     bl_label = "Cloth Stiffness Scaling"
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 4b4ff15014d..b8c5c010407 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -342,7 +342,7 @@ class IMAGE_PT_image_properties(bpy.types.Panel):
         # ima = sima.image
         iuser = sima.image_user
 
-        layout.template_image(sima, "image", iuser, compact=True)
+        layout.template_image(sima, "image", iuser)
 
 
 class IMAGE_PT_game_properties(bpy.types.Panel):