diff options
| author | Germano <germano.costa@ig.com.br> | 2017-12-05 16:19:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2017-12-05 16:19:47 +0300 |
| commit | 6734bb1faf3a4c5c2446ecc4d2261f0d2ea9a39b (patch) | |
| tree | 6cc83f565c6cff4e27ee4d3a46a0d57ecbe083e9 /release | |
| parent | deaeee8e4d92cfd43e641db6a86273e70a4dae7d (diff) | |
| parent | 70c2d8a1a2b8b1e8c1f60f30451dbad88fba7188 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/editors/mesh/editmesh_select.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_bone.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index e0e46e4a266..f0ef0032059 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -188,13 +188,13 @@ class BONE_PT_curved(BoneButtonsPanel, Panel): row = col.row() sub = row.column(align=True) sub.label(text="Scale:") - sub.prop(bbone, "bbone_scalein", text="Scale In") - sub.prop(bbone, "bbone_scaleout", text="Scale Out") + sub.prop(bbone, "bbone_scalein", text="In") + sub.prop(bbone, "bbone_scaleout", text="Out") sub = row.column(align=True) sub.label("Easing:") - sub.prop(bbone, "bbone_easein", text="Ease In") - sub.prop(bbone, "bbone_easeout", text="Ease Out") + sub.prop(bbone, "bbone_easein", text="In") + sub.prop(bbone, "bbone_easeout", text="Out") if pchan: layout.separator() |