griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-11-02 15:44:33 +11:00
parent cf6e45b522 765e28948e
commit 4a85089abe
40 changed files with 1149 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
release/scripts/startup/bl_ui/properties_data_bone.py
View File

@@ -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()