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 /source/blender/makesrna/intern/rna_armature.c | |
| parent | deaeee8e4d92cfd43e641db6a86273e70a4dae7d (diff) | |
| parent | 70c2d8a1a2b8b1e8c1f60f30451dbad88fba7188 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/editors/mesh/editmesh_select.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_armature.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index f8a492c3cee..1ec0fd92a67 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -549,14 +549,14 @@ void rna_def_bone_curved_common(StructRNA *srna, bool is_posebone) RNA_def_property_float_sdna(prop, NULL, "ease1"); RNA_def_property_range(prop, -5.0f, 5.0f); RNA_def_property_float_default(prop, 1.0f); - RNA_def_property_ui_text(prop, "B-Bone Ease In", "Length of first Bezier Handle (for B-Bones only)"); + RNA_def_property_ui_text(prop, "Ease In", "Length of first Bezier Handle (for B-Bones only)"); RNA_DEF_CURVEBONE_UPDATE(prop, is_posebone); prop = RNA_def_property(srna, "bbone_easeout", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ease2"); RNA_def_property_range(prop, -5.0f, 5.0f); RNA_def_property_float_default(prop, 1.0f); - RNA_def_property_ui_text(prop, "B-Bone Ease Out", "Length of second Bezier Handle (for B-Bones only)"); + RNA_def_property_ui_text(prop, "Ease Out", "Length of second Bezier Handle (for B-Bones only)"); RNA_DEF_CURVEBONE_UPDATE(prop, is_posebone); /* Scale In/Out */ |