diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 15:05:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 15:05:52 +0400 |
| commit | 305d341ec2c2c5c6485ad6cd719e9472e4bb460d (patch) | |
| tree | fa4c658ad417869a0ed2e7ef5f37ca94adb2cc3b /source/blender/editors/armature | |
| parent | 13bbf1cc7b0a620173475172278d2f8eb9593ccd (diff) | |
code cleanup: use vector math function minmax_v3v3_v3() and other minor vector function edits.
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f698153eb7f..8e2dfb72703 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -569,8 +569,8 @@ void docenter_armature(Scene *scene, Object *ob, float cursor[3], int centermode float min[3], max[3]; INIT_MINMAX(min, max); for (ebone = arm->edbo->first; ebone; ebone = ebone->next) { - DO_MINMAX(ebone->head, min, max); - DO_MINMAX(ebone->tail, min, max); + minmax_v3v3_v3(min, max, ebone->head); + minmax_v3v3_v3(min, max, ebone->tail); } mid_v3_v3v3(cent, min, max); } diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index ccba3599318..b975d156868 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -451,11 +451,11 @@ static void heat_ray_tree_create(LaplacianSystem *sys) float bb[6]; INIT_MINMAX(bb, bb + 3); - DO_MINMAX(verts[mf->v1], bb, bb + 3); - DO_MINMAX(verts[mf->v2], bb, bb + 3); - DO_MINMAX(verts[mf->v3], bb, bb + 3); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v1]); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v2]); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v3]); if (mf->v4) { - DO_MINMAX(verts[mf->v4], bb, bb + 3); + minmax_v3v3_v3(bb, bb + 3, verts[mf->v4]); } BLI_bvhtree_insert(sys->heat.bvhtree, a, bb, 2); @@ -1753,7 +1753,7 @@ static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierDa INIT_MINMAX(mdb->min, mdb->max); for (a = 0; a < mdb->totcagevert; a++) - DO_MINMAX(mdb->cagecos[a], mdb->min, mdb->max); + minmax_v3v3_v3(mdb->min, mdb->max, mdb->cagecos[a]); /* allocate memory */ mdb->size = (2 << (mmd->gridsize - 1)) + 2; |