Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2016-07-07 16:59:43 +0300
committerJoshua Leung <aligorith@gmail.com>2016-07-07 16:59:43 +0300
commit91533b6f343e97294b05a8a007a67e97c4ea304a (patch)
treea556e102fd499d916bff543d6e43a901279031d0 /release
parent4bf19e163fea4660b03242cbd1305251595baf2b (diff)
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.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_constraint.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index 2a98303d00e..4ca2f773dcc 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")