Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / release / ui / buttons_object_constraint.py
index ff3231a..c67d6e4 100644 (file)
@@ -2,8 +2,8 @@
 import bpy
 
 class ConstraintButtonsPanel(bpy.types.Panel):
-       __space_type__ = 'PROPERTIES'
-       __region_type__ = 'WINDOW'
+       __space_type__ = "PROPERTIES"
+       __region_type__ = "WINDOW"
        __context__ = "constraint"
 
        def draw_constraint(self, con):
@@ -39,7 +39,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
                layout.itemR(con, "target") # XXX limiting settings for only 'curves' or some type of object
                
                if con.target and subtargets:
-                       if con.target.type == 'ARMATURE':
+                       if con.target.type == "ARMATURE":
                                layout.item_pointerR(con, "subtarget", con.target.data, "bones", text="Bone")
                                
                                if con.type == 'COPY_LOCATION':
@@ -121,17 +121,9 @@ class ConstraintButtonsPanel(bpy.types.Panel):
        def FOLLOW_PATH(self, layout, con):
                self.target_template(layout, con)
                
-               split = layout.split()
-               
-               col = split.column()
-               col.itemR(con, "curve_follow")
-               
-               col = split.column()
-               col.itemR(con, "fixed_position")
-               if con.fixed_position:
-                       col.itemR(con, "offset_percentage", text="Offset")
-               else:
-                       col.itemR(con, "offset")
+               row = layout.row()
+               row.itemR(con, "curve_follow")
+               row.itemR(con, "offset")
                
                row = layout.row()
                row.itemL(text="Forward:")
@@ -486,7 +478,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
                layout.itemR(con, "distance")
                layout.itemR(con, "shrinkwrap_type")
                
-               if con.shrinkwrap_type == 'PROJECT':
+               if con.shrinkwrap_type == "PROJECT":
                        row = layout.row(align=True)
                        row.itemR(con, "axis_x")
                        row.itemR(con, "axis_y")