diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-10-02 16:36:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-10-02 18:40:51 +0300 |
| commit | 5fc992e76aeeedf1955c9d7c561fb8b7c8a398a5 (patch) | |
| tree | 676240546671a8f8ce179cb1a8b86f569c1db65c /source/blender/editors/armature | |
| parent | e3b49bb850018ae73088b8d4e7c195206f8b2f31 (diff) | |
Cleanup: Move `EditBone` structure definition from `ED` to `BKE` area.
Access to this structure will be needed in BKE's armature code.
Diffstat (limited to 'source/blender/editors/armature')
4 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index 016a00bda56..5f01c4ed038 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -36,6 +36,7 @@ #include "BLI_string_utils.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_deform.h" diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 438bb8e447b..4fff2ae03b0 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -223,7 +223,9 @@ void POSE_OT_propagate(struct wmOperatorType *ot); * but some tools still have a bit of overlap which makes things messy -- Feb 2013 */ -EditBone *make_boneList(struct ListBase *edbo, struct ListBase *bones, struct Bone *actBone); +struct EditBone *make_boneList(struct ListBase *edbo, + struct ListBase *bones, + struct Bone *actBone); /* duplicate method */ void preEditBoneDuplicate(struct ListBase *editbones); @@ -241,7 +243,7 @@ struct EditBone *duplicateEditBoneObjects(struct EditBone *cur_bone, struct Object *src_ob, struct Object *dst_ob); -EditBone *add_points_bone(struct Object *obedit, float head[3], float tail[3]); +struct EditBone *add_points_bone(struct Object *obedit, float head[3], float tail[3]); void bone_free(struct bArmature *arm, struct EditBone *bone); void armature_tag_select_mirrored(struct bArmature *arm); @@ -249,10 +251,10 @@ void armature_select_mirrored_ex(struct bArmature *arm, const int flag); void armature_select_mirrored(struct bArmature *arm); void armature_tag_unselect(struct bArmature *arm); -EditBone *ED_armature_pick_ebone(struct bContext *C, - const int xy[2], - bool findunsel, - struct Base **r_base); +struct EditBone *ED_armature_pick_ebone(struct bContext *C, + const int xy[2], + bool findunsel, + struct Base **r_base); struct bPoseChannel *ED_armature_pick_pchan(struct bContext *C, const int xy[2], bool findunsel, diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 09d54410e55..c9bcd4f02e9 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -34,6 +34,7 @@ #include "BLI_string_utils.h" #include "BKE_action.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_object.h" diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c index a3a73f8d509..bdb08abbf2c 100644 --- a/source/blender/editors/armature/editarmature_undo.c +++ b/source/blender/editors/armature/editarmature_undo.c @@ -31,6 +31,7 @@ #include "BLI_array_utils.h" #include "BLI_listbase.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_main.h" |