diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /release/scripts/startup/bl_ui/properties_constraint.py | |
parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_constraint.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_constraint.py | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index da35ea680b8..f46e9f9727f 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -374,7 +374,6 @@ class ConstraintButtonsPanel(Panel): subsub.prop(con, "max_z", text="") row.prop_decorator(con, "max_z") - layout.prop(con, "use_transform_limit") layout.prop(con, "owner_space") @@ -508,7 +507,18 @@ class ConstraintButtonsPanel(Panel): layout.use_property_split = True layout.use_property_decorate = True - self.target_template(layout, con) + target_row = layout.row(align=True) + target_row.active = not con.use_eval_time + self.target_template(target_row, con) + + row = layout.row(align=True, heading="Evaluation Time") + row.use_property_decorate = False + sub = row.row(align=True) + sub.prop(con, "use_eval_time", text="") + subsub = sub.row(align=True) + subsub.active = con.use_eval_time + subsub.prop(con, "eval_time", text="") + row.prop_decorator(con, "eval_time") layout.prop(con, "mix_mode", text="Mix") @@ -741,7 +751,6 @@ class ConstraintButtonsPanel(Panel): row.active = not con.use_3d_position row.prop(con, "use_undistorted_position") - if not con.use_active_clip: layout.prop(con, "clip") @@ -1105,13 +1114,14 @@ class ConstraintButtonsSubPanel(Panel): layout.use_property_split = True layout.use_property_decorate = True - layout.prop(con, "transform_channel", text="Channel") - layout.prop(con, "target_space") - - col = layout.column(align=True) - col.prop(con, "min", text="Range Min") - col.prop(con, "max", text="Max") + col = layout.column() + col.active = not con.use_eval_time + col.prop(con, "transform_channel", text="Channel") + col.prop(con, "target_space") + sub = col.column(align=True) + sub.prop(con, "min", text="Range Min") + sub.prop(con, "max", text="Max") def draw_action_action(self, context): layout = self.layout @@ -1140,6 +1150,7 @@ class BONE_PT_bChildOfConstraint(BoneConstraintPanel, ConstraintButtonsPanel): # Track To Constraint + class OBJECT_PT_bTrackToConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_trackto(context) @@ -1151,6 +1162,7 @@ class BONE_PT_bTrackToConstraint(BoneConstraintPanel, ConstraintButtonsPanel): # Follow Path Constraint + class OBJECT_PT_bFollowPathConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_follow_path(context) @@ -1518,12 +1530,12 @@ class OBJECT_PT_bPythonConstraint(ObjectConstraintPanel, ConstraintButtonsPanel) def draw(self, context): self.draw_python_constraint(context) + class BONE_PT_bPythonConstraint(BoneConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_python_constraint(context) - # Armature Constraint class OBJECT_PT_bArmatureConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): @@ -1564,7 +1576,6 @@ class BONE_PT_bKinematicConstraint(BoneConstraintPanel, ConstraintButtonsPanel): self.draw_kinematic(context) - classes = ( # Object Panels OBJECT_PT_constraints, |