diff options
| author | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
|---|---|---|
| committer | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
| commit | d8c05502272990173381bfd2590884bbc95aa5f5 (patch) | |
| tree | 8bd65efacbe6484b838d4550597d0f4a54ddddd9 /source/blender/editors/armature/armature_intern.h | |
| parent | b64d551f3b2fa409b4eeefb641fc581eb6cd0bd6 (diff) | |
| parent | fe1816f67fbc6aaf383ec77847d668367335d093 (diff) | |
Merge branch 'master' into KTX_supportKTX_support
Diffstat (limited to 'source/blender/editors/armature/armature_intern.h')
| -rw-r--r-- | source/blender/editors/armature/armature_intern.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 252cf806e34..aaeac29b7d0 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -27,6 +27,7 @@ struct wmOperatorType; struct Base; +struct GPUSelectResult; struct Object; struct Scene; struct bContext; @@ -323,21 +324,21 @@ struct Bone *ED_armature_pick_bone(struct bContext *C, struct EditBone *ED_armature_pick_ebone_from_selectbuffer(struct Base **bases, uint bases_len, - const uint *buffer, + const struct GPUSelectResult *buffer, short hits, bool findunsel, bool do_nearest, struct Base **r_base); struct bPoseChannel *ED_armature_pick_pchan_from_selectbuffer(struct Base **bases, uint bases_len, - const uint *buffer, + const struct GPUSelectResult *buffer, short hits, bool findunsel, bool do_nearest, struct Base **r_base); struct Bone *ED_armature_pick_bone_from_selectbuffer(struct Base **bases, uint bases_len, - const uint *buffer, + const struct GPUSelectResult *buffer, short hits, bool findunsel, bool do_nearest, |