diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
| commit | 9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a (patch) | |
| tree | 25e8fd41033e82b6cb04a00b52390f899dc085e5 /source/blender/makesrna | |
| parent | f3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689 (diff) | |
| parent | 0f2efce6c50718d7745a6dc1613acf62a186cc05 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_armature_api.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index bbcb583ab39..05074bc9f16 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -108,7 +108,7 @@ static EditBone *rna_Armature_edit_bone_new(bArmature *arm, ReportList *reports, BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in edit mode, cannot add an editbone", arm->id.name + 2); return NULL; } - return ED_armature_edit_bone_add(arm, name); + return ED_armature_ebone_add(arm, name); } static void rna_Armature_edit_bone_remove(bArmature *arm, ReportList *reports, PointerRNA *ebone_ptr) @@ -124,7 +124,7 @@ static void rna_Armature_edit_bone_remove(bArmature *arm, ReportList *reports, P return; } - ED_armature_edit_bone_remove(arm, ebone); + ED_armature_ebone_remove(arm, ebone); RNA_POINTER_INVALIDATE(ebone_ptr); } @@ -427,7 +427,7 @@ static void rna_Armature_editbone_transform_update(Main *bmain, Scene *scene, Po copy_v3_v3(child->head, ebone->tail); if (arm->flag & ARM_MIRROR_EDIT) { - eboflip = ED_armature_bone_get_mirrored(arm->edbo, ebone); + eboflip = ED_armature_ebone_get_mirrored(arm->edbo, ebone); if (eboflip) { eboflip->roll = -ebone->roll; diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c index 0616331bc05..222baf99afd 100644 --- a/source/blender/makesrna/intern/rna_armature_api.c +++ b/source/blender/makesrna/intern/rna_armature_api.c @@ -46,7 +46,7 @@ static void rna_EditBone_align_roll(EditBone *ebo, float no[3]) { - ebo->roll = ED_rollBoneToVector(ebo, no, false); + ebo->roll = ED_armature_ebone_roll_to_vector(ebo, no, false); } static float rna_Bone_do_envelope(Bone *bone, float *vec) |