[Bf-blender-cvs] [91533b6] master: Revert "ChildOf Constraint: Hide the Loc/Rot/Scale toggles"

Joshua Leung noreply at git.blender.org
Thu Jul 7 15:59:52 CEST 2016


Commit: 91533b6f343e97294b05a8a007a67e97c4ea304a
Author: Joshua Leung
Date:   Fri Jul 8 01:59:43 2016 +1200
Branches: master
https://developer.blender.org/rB91533b6f343e97294b05a8a007a67e97c4ea304a

Revert "ChildOf Constraint: Hide the Loc/Rot/Scale toggles"

This reverts commit 4fd78bb06faa31f265af6a5f247cf4255b5ac479.

After further testing, it turns out that these options are less-broken than
I remember them being (and have been hearing about). Specifically, as long
as you disable all 3-axes of a transform component (i.e. all location, all
rotation, all scale) you're not likely to have problems, whereas if you only
disabled one axis (i.e. y-rotation), you may have problems in some cases.

So, restoring these to the UI.

===================================================================

M	release/scripts/startup/bl_ui/properties_constraint.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index 2a98303..4ca2f77 100644
--- a/release/scripts/startup/bl_ui/properties_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_constraint.py
@@ -96,25 +96,25 @@ class ConstraintButtonsPanel:
     def CHILD_OF(self, context, layout, con):
         self.target_template(layout, con)
 
-        #split = layout.split()
-
-        #col = split.column()
-        #col.label(text="Location:")
-        #col.prop(con, "use_location_x", text="X")
-        #col.prop(con, "use_location_y", text="Y")
-        #col.prop(con, "use_location_z", text="Z")
-
-        #col = split.column()
-        #col.label(text="Rotation:")
-        #col.prop(con, "use_rotation_x", text="X")
-        #col.prop(con, "use_rotation_y", text="Y")
-        #col.prop(con, "use_rotation_z", text="Z")
-
-        #col = split.column()
-        #col.label(text="Scale:")
-        #col.prop(con, "use_scale_x", text="X")
-        #col.prop(con, "use_scale_y", text="Y")
-        #col.prop(con, "use_scale_z", text="Z")
+        split = layout.split()
+
+        col = split.column()
+        col.label(text="Location:")
+        col.prop(con, "use_location_x", text="X")
+        col.prop(con, "use_location_y", text="Y")
+        col.prop(con, "use_location_z", text="Z")
+
+        col = split.column()
+        col.label(text="Rotation:")
+        col.prop(con, "use_rotation_x", text="X")
+        col.prop(con, "use_rotation_y", text="Y")
+        col.prop(con, "use_rotation_z", text="Z")
+
+        col = split.column()
+        col.label(text="Scale:")
+        col.prop(con, "use_scale_x", text="X")
+        col.prop(con, "use_scale_y", text="Y")
+        col.prop(con, "use_scale_z", text="Z")
 
         row = layout.row()
         row.operator("constraint.childof_set_inverse")




More information about the Bf-blender-cvs mailing list