diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 07:44:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 07:45:19 +0300 |
commit | 4a85089abe6d5abb9f6bb0d8255eba33dc030fcb (patch) | |
tree | 25459e54af9cf6712ca349b924319939ba853909 /release/scripts/startup/bl_ui/properties_data_bone.py | |
parent | cf6e45b5224d16263d7c87411a2ff71ed928410f (diff) | |
parent | 765e28948e706d8fce97c23d4d050a607971488b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_bone.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_bone.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index e6a2a266e08..e0e46e4a266 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -193,13 +193,8 @@ class BONE_PT_curved(BoneButtonsPanel, Panel): sub = row.column(align=True) sub.label("Easing:") - if pchan: - # XXX: have these also be an overlay? - sub.prop(bbone.bone, "bbone_in", text="Ease In") - sub.prop(bbone.bone, "bbone_out", text="Ease Out") - else: - sub.prop(bone, "bbone_in", text="Ease In") - sub.prop(bone, "bbone_out", text="Ease Out") + sub.prop(bbone, "bbone_easein", text="Ease In") + sub.prop(bbone, "bbone_easeout", text="Ease Out") if pchan: layout.separator() |