diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-03 14:55:35 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-03 14:55:35 +0300 |
commit | 2a82162618f7b8325a59fe42336b2a5f215e7080 (patch) | |
tree | bd79cd69f936ace1acf7269a19efbfbbc37689a0 /source/blender/editors/armature/armature_intern.h | |
parent | 22df0b2fe2998d51b6ca612867a995f848345f8d (diff) | |
parent | c0d0ef142fce15b839c369e9f7413c36b72aa8cb (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/armature/pose_select.c
source/blender/editors/include/ED_armature.h
Diffstat (limited to 'source/blender/editors/armature/armature_intern.h')
-rw-r--r-- | source/blender/editors/armature/armature_intern.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 4fae9ad9c9e..8c1083dc290 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -247,8 +247,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); -void *get_nearest_bone(struct bContext *C, short findunsel, int x, int y); -void *get_bone_from_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer, short hits, short findunsel, bool do_nearest); +void *get_nearest_bone(struct bContext *C, const int xy[2], bool findunsel); +void *get_bone_from_selectbuffer( + struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits, + bool findunsel, bool do_nearest); int bone_looper(struct Object *ob, struct Bone *bone, void *data, int (*bone_func)(struct Object *, struct Bone *, void *)); |