diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-28 00:30:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-28 00:35:06 +0300 |
commit | 64de8c8f0de018f5d2b075db738d7b6322d6d21a (patch) | |
tree | ff53a72ce9481e477b7fafe60f44b7c774c6845f /source/blender/editors/include/ED_armature.h | |
parent | fcdc7acd8b5963fd4f9fb0a81317c54654d577de (diff) |
Missed in last merge from master
Local changes built, but merge-commit needed amending.
Diffstat (limited to 'source/blender/editors/include/ED_armature.h')
-rw-r--r-- | source/blender/editors/include/ED_armature.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index bbc6e8912c3..d65ea8e79f0 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -39,6 +39,7 @@ struct BaseLegacy; struct bContext; struct Bone; struct bPoseChannel; +struct EvaluationContext; struct IDProperty; struct ListBase; struct MeshDeformModifierData; @@ -174,8 +175,9 @@ void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do #define ARM_GROUPS_ENVELOPE 2 #define ARM_GROUPS_AUTO 3 -void create_vgroups_from_armature(struct ReportList *reports, const struct bContext *C, struct Scene *scene, - struct Object *ob, struct Object *par, const int mode, const bool mirror); +void create_vgroups_from_armature( + struct ReportList *reports, const struct EvaluationContext *eval_ctx, struct Scene *scene, + struct Object *ob, struct Object *par, const int mode, const bool mirror); /* if bone is already in list, pass it as param to ignore it */ void unique_editbone_name(struct ListBase *ebones, char *name, EditBone *bone); |