diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-02-03 12:02:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-02-03 12:02:36 +0300 |
| commit | b9483ea38026095890cbb5fedff96a3bb0f40e2f (patch) | |
| tree | f68ba60e7857bc1c7fd6dc659efc85b4b4c22b76 /source/blender/editors | |
| parent | e468abc360e0c9889949b4814551e282e926240d (diff) | |
| parent | c8cca888518182914e6b4f1b98e0f7b861add08d (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 787d7cbaab0..14f47a84286 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -1742,14 +1742,15 @@ static void harmonic_coordinates_bind(MeshDeformModifierData *mmd, MeshDeformBin free_bvhtree_from_mesh(&mdb->bvhdata); } -void ED_mesh_deform_bind_callback(MeshDeformModifierData *mmd, +void ED_mesh_deform_bind_callback(Object *object, + MeshDeformModifierData *mmd, Mesh *cagemesh, float *vertexcos, int totvert, float cagemat[4][4]) { MeshDeformModifierData *mmd_orig = (MeshDeformModifierData *)BKE_modifier_get_original( - &mmd->modifier); + object, &mmd->modifier); MeshDeformBind mdb; MVert *mvert; int a; diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index afba3c7b96a..0521b39ca1a 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -369,7 +369,8 @@ void ED_pose_bone_select_tag_update(struct Object *ob); void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select); /* meshlaplacian.c */ -void ED_mesh_deform_bind_callback(struct MeshDeformModifierData *mmd, +void ED_mesh_deform_bind_callback(struct Object *object, + struct MeshDeformModifierData *mmd, struct Mesh *cagemesh, float *vertexcos, int totvert, |