diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-22 21:20:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-22 21:20:37 +0400 |
commit | cd4123e1db8a40836fa04813ef7dc440ef7feeb0 (patch) | |
tree | 9a10e2dd83251954c8dfcfddd430cb46931b9d99 /source/blender/editors | |
parent | 39aaf4f2f0af3e0663a19381d65081a9090fc10e (diff) |
use inline BLI_math functions for dot product and length calculation.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index f91740f4b47..7fe98a604ec 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -870,7 +870,7 @@ static void getVerticalAndHorizontalChange(const float norm[3], float d, const f closest_to_plane_v3(projB, coord, norm, end); // (vertical and horizontal refer to the plane's y and xz respectively) // vertical distance - dists[index] = norm[0]*end[0] + norm[1]*end[1] + norm[2]*end[2] + d; + dists[index] = dot_v3v3(norm, end) + d; // vertical change changes[index][0] = dists[index] - distToStart; //printf("vc %f %f\n", distance(end, projB, 3)-distance(start, projA, 3), changes[index][0]); @@ -1111,7 +1111,7 @@ static void vgroup_fix(Scene *scene, Object *ob, float distToBe, float strength, mag= normalize_v3(norm); if(mag) { /* zeros fix */ d = -dot_v3v3(norm, coord); - /* dist = (norm[0]*m.co[0] + norm[1]*m.co[1] + norm[2]*m.co[2] + d); */ /* UNUSED */ + /* dist = (dot_v3v3(norm, m.co) + d); */ /* UNUSED */ moveCloserToDistanceFromPlane(scene, ob, me, i, norm, coord, d, distToBe, strength, cp); } } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 2620fe4ac71..f617f673397 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -634,7 +634,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) sub_v3_v3v3(dvec, newvec, vod->trackvec); - si= sqrt(dvec[0]*dvec[0]+ dvec[1]*dvec[1]+ dvec[2]*dvec[2]); + si = len_v3(dvec); si /= (float)(2.0 * TRACKBALLSIZE); cross_v3_v3v3(q1+1, vod->trackvec, newvec); |