diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-21 16:27:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-21 16:27:48 +0400 |
commit | fba7ebcbea35d3b14f535f7f7a50c61074ae7092 (patch) | |
tree | 91045bfb888e38b02b109b6174c8b93102b649d2 /source/blender/blenlib/intern | |
parent | f7717b2e80907a974b472d0ee786f63b06efa40c (diff) |
replace add_v3_v3v3() --> add_v3_v3() where possible
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/graph.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c index 808dc743d44..b1ea058eda1 100644 --- a/source/blender/blenlib/intern/graph.c +++ b/source/blender/blenlib/intern/graph.c @@ -529,7 +529,7 @@ void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]) sub_v3_v3v3(dv, v, center); project_v3_v3v3(pv, dv, axis); mul_v3_fl(pv, -2); - add_v3_v3v3(v, v, pv); + add_v3_v3(v, pv); } static void testRadialSymmetry(BGraph *graph, BNode* root_node, RadialArc* ring, int total, float axis[3], float limit, int group) @@ -801,7 +801,7 @@ static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNo sub_v3_v3v3(p, root_node->p, node2->p); cross_v3_v3v3(vec, p, axis); - add_v3_v3v3(vec, vec, nor); + add_v3_v3(vec, nor); cross_v3_v3v3(nor, vec, axis); @@ -905,7 +905,7 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int /* If arc is on the axis */ else if (connectedArc->symmetry_level == level) { - add_v3_v3v3(axis, axis, connectedArc->head->p); + add_v3_v3(axis, connectedArc->head->p); sub_v3_v3v3(axis, axis, connectedArc->tail->p); } } diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index af408e6bcc9..f973d4e894b 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -719,7 +719,7 @@ int isect_sweeping_sphere_tri_v3(float p1[3], float p2[3], float radius, float v *lambda = newLambda; copy_v3_v3(ipoint,e1); mul_v3_fl(ipoint,e); - add_v3_v3v3(ipoint,ipoint,v0); + add_v3_v3(ipoint, v0); found_by_sweep=1; } } @@ -743,7 +743,7 @@ int isect_sweeping_sphere_tri_v3(float p1[3], float p2[3], float radius, float v *lambda = newLambda; copy_v3_v3(ipoint,e2); mul_v3_fl(ipoint,e); - add_v3_v3v3(ipoint,ipoint,v0); + add_v3_v3(ipoint, v0); found_by_sweep=1; } } @@ -772,7 +772,7 @@ int isect_sweeping_sphere_tri_v3(float p1[3], float p2[3], float radius, float v *lambda = newLambda; copy_v3_v3(ipoint,e3); mul_v3_fl(ipoint,e); - add_v3_v3v3(ipoint,ipoint,v1); + add_v3_v3(ipoint, v1); found_by_sweep=1; } } @@ -1832,7 +1832,7 @@ void sum_or_add_vertex_tangent(void *arena, VertexTangent **vtang, float *tang, /* find a tangent with connected uvs */ for(vt= *vtang; vt; vt=vt->next) { if(fabs(uv[0]-vt->uv[0]) < STD_UV_CONNECT_LIMIT && fabs(uv[1]-vt->uv[1]) < STD_UV_CONNECT_LIMIT) { - add_v3_v3v3(vt->tang, vt->tang, tang); + add_v3_v3(vt->tang, tang); return; } } @@ -1952,19 +1952,19 @@ void vcloud_estimate_transform(int list_size, float (*pos)[3], float *weight,flo float v[3]; copy_v3_v3(v,pos[a]); mul_v3_fl(v,weight[a]); - add_v3_v3v3(accu_com,accu_com,v); + add_v3_v3(accu_com, v); accu_weight +=weight[a]; } - else add_v3_v3v3(accu_com,accu_com,pos[a]); + else add_v3_v3(accu_com, pos[a]); if (rweight){ float v[3]; copy_v3_v3(v,rpos[a]); mul_v3_fl(v,rweight[a]); - add_v3_v3v3(accu_rcom,accu_rcom,v); + add_v3_v3(accu_rcom, v); accu_rweight +=rweight[a]; } - else add_v3_v3v3(accu_rcom,accu_rcom,rpos[a]); + else add_v3_v3(accu_rcom, rpos[a]); } if (!weight || !rweight){ |