diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
| commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
| tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/blenkernel/intern/armature.c | |
| parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
| parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 17a708fc3ba..22059a1ff0a 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1059,9 +1059,10 @@ static void armature_bbone_defmats_cb(void *userdata, Link *iter, int index) } } -void armature_deform_verts(Object *armOb, Object *target, const Mesh * mesh, float (*vertexCos)[3], - float (*defMats)[3][3], int numVerts, int deformflag, - float (*prevCos)[3], const char *defgrp_name, bGPDstroke *gps) +void armature_deform_verts( + Object *armOb, Object *target, const Mesh *mesh, float (*vertexCos)[3], + float (*defMats)[3][3], int numVerts, int deformflag, + float (*prevCos)[3], const char *defgrp_name, bGPDstroke *gps) { bPoseChanDeform *pdef_info_array; bPoseChanDeform *pdef_info = NULL; |