[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28395] trunk/blender/source/blender: sub_v3_v3v3 --> sub_v3_v3 (where possible)
Campbell Barton
ideasman42 at gmail.com
Sat Apr 24 01:57:01 CEST 2010
Revision: 28395
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28395
Author: campbellbarton
Date: 2010-04-24 01:57:00 +0200 (Sat, 24 Apr 2010)
Log Message:
-----------
sub_v3_v3v3 --> sub_v3_v3 (where possible)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/sketch.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_generate.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -727,9 +727,8 @@
vertexDupliData *vdd= userData;
float vec[3], q2[4], mat[3][3], tmat[4][4], obmat[4][4];
- VECCOPY(vec, co);
- mul_m4_v3(vdd->pmat, vec);
- sub_v3_v3v3(vec, vec, vdd->pmat[3]);
+ mul_v3_m4v3(vec, vdd->pmat, co);
+ sub_v3_v3(vec, vdd->pmat[3]);
add_v3_v3(vec, vdd->obmat[3]);
copy_m4_m4(obmat, vdd->obmat);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -850,9 +850,8 @@
mul_m4_v3(pchan->chan_mat, cop);
// Make this a delta from the base position
- sub_v3_v3v3(cop, cop, co);
- cop[0]*=fac; cop[1]*=fac; cop[2]*=fac;
- add_v3_v3(vec, cop);
+ sub_v3_v3(cop, co);
+ madd_v3_v3fl(vec, cop, fac);
if(mat)
pchan_deform_mat_add(pchan, fac, bbonemat, mat);
@@ -1110,7 +1109,7 @@
if(armature_weight != 1.0f) {
VECCOPY(dco, co);
mul_v3m3_dq( dco, (defMats)? summat: NULL,dq);
- sub_v3_v3v3(dco, dco, co);
+ sub_v3_v3(dco, co);
mul_v3_fl(dco, armature_weight);
add_v3_v3(co, dco);
}
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -400,8 +400,8 @@
mul_v3_fl(loc, 1.0f/((float)neighbors - 1.0f));
mul_v3_fl(vec, 1.0f/((float)neighbors - 1.0f));
- sub_v3_v3v3(loc, loc, pa->prev_state.co);
- sub_v3_v3v3(vec, vec, pa->prev_state.vel);
+ sub_v3_v3(loc, pa->prev_state.co);
+ sub_v3_v3(vec, pa->prev_state.vel);
add_v3_v3(bbd->wanted_co, vec);
add_v3_v3(bbd->wanted_co, loc);
@@ -573,7 +573,7 @@
if(asbr->level > 0.0f && psys_uses_gravity(bbd->sim)) {
project_v3_v3v3(vec, bbd->wanted_co, bbd->sim->scene->physics_settings.gravity);
mul_v3_fl(vec, asbr->level);
- sub_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec);
+ sub_v3_v3(bbd->wanted_co, vec);
}
}
else {
@@ -590,7 +590,7 @@
if(asbr->level > 0.0f && psys_uses_gravity(bbd->sim)) {
project_v3_v3v3(vec, bbd->wanted_co, bbd->sim->scene->physics_settings.gravity);
mul_v3_fl(vec, asbr->level);
- sub_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec);
+ sub_v3_v3(bbd->wanted_co, vec);
}
}
@@ -765,10 +765,10 @@
if(!bbd->sim->colliders)
return NULL;
- VECCOPY(col.co1, pa->state.co);
- VECCOPY(col.co2, pa->state.co);
+ copy_v3_v3(col.co1, pa->state.co);
+ copy_v3_v3(col.co2, pa->state.co);
add_v3_v3(col.co1, zvec);
- sub_v3_v3v3(col.co2, col.co2, zvec);
+ sub_v3_v3(col.co2, zvec);
sub_v3_v3v3(ray_dir, col.co2, col.co1);
col.t = 0.0f;
hit.index = -1;
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -467,7 +467,7 @@
if(vec[0] < bezt[0].vec[1][0])
vec[0]= bezt[0].vec[1][0];
- sub_v3_v3v3(vec, vec, bezt[0].vec[1]);
+ sub_v3_v3(vec, bezt[0].vec[1]);
nlen= len_v3(vec);
if(nlen>FLT_EPSILON) {
mul_v3_fl(vec, hlen/nlen);
@@ -484,7 +484,7 @@
if(vec[0] > bezt[a].vec[1][0])
vec[0]= bezt[a].vec[1][0];
- sub_v3_v3v3(vec, vec, bezt[a].vec[1]);
+ sub_v3_v3(vec, bezt[a].vec[1]);
nlen= len_v3(vec);
if(nlen>FLT_EPSILON) {
mul_v3_fl(vec, hlen/nlen);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -2341,12 +2341,12 @@
default:
DO_MINMAX(ob->obmat[3], min, max);
- VECCOPY(vec, ob->obmat[3]);
+ copy_v3_v3(vec, ob->obmat[3]);
add_v3_v3(vec, ob->size);
DO_MINMAX(vec, min, max);
- VECCOPY(vec, ob->obmat[3]);
- sub_v3_v3v3(vec, vec, ob->size);
+ copy_v3_v3(vec, ob->obmat[3]);
+ sub_v3_v3(vec, ob->size);
DO_MINMAX(vec, min, max);
break;
}
Modified: trunk/blender/source/blender/blenkernel/intern/sketch.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sketch.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/blenkernel/intern/sketch.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -336,7 +336,7 @@
VECCOPY(offset, normal);
mul_v3_fl(offset, d);
- sub_v3_v3v3(p, p, distance);
+ sub_v3_v3(p, distance);
add_v3_v3(p, offset);
}
}
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -457,8 +457,8 @@
/* Do the adjustments */
for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
- sub_v3_v3v3(ebone->head, ebone->head, cent);
- sub_v3_v3v3(ebone->tail, ebone->tail, cent);
+ sub_v3_v3(ebone->head, cent);
+ sub_v3_v3(ebone->tail, cent);
}
/* Turn the list into an armature */
@@ -469,9 +469,7 @@
copy_m3_m4(omat, ob->obmat);
mul_m3_v3(omat, cent);
- ob->loc[0] += cent[0];
- ob->loc[1] += cent[1];
- ob->loc[2] += cent[2];
+ add_v3_v3(ob->loc, cent);
}
else
ED_armature_edit_free(ob);
Modified: trunk/blender/source/blender/editors/armature/editarmature_generate.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_generate.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/armature/editarmature_generate.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -60,7 +60,7 @@
sub_v3_v3v3(tangent, bone->tail, bone->head);
project_v3_v3v3(vec, tangent, normal);
- sub_v3_v3v3(normal, normal, vec);
+ sub_v3_v3(normal, vec);
normalize_v3(normal);
@@ -102,7 +102,7 @@
IT_peek(iter, i);
sub_v3_v3v3(v, iter->p, v0);
project_v3_v3v3(d, v, n);
- sub_v3_v3v3(v, v, d);
+ sub_v3_v3(v, d);
dt = len_v3(d) - avg_t;
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -568,8 +568,8 @@
{
float d_rgb[3] = {1, 1, 1};
- VECCOPY(rgb, color);
- sub_v3_v3v3(d_rgb, d_rgb, rgb);
+ copy_v3_v3(rgb, color);
+ sub_v3_v3(d_rgb, rgb);
mul_v3_fl(d_rgb, 1.0f / (float)stk->nb_points);
for (i = 0; i < stk->nb_points; i++)
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -632,7 +632,7 @@
void removeVertFromBucket(EmbedBucket *b, float co[3])
{
mul_v3_fl(b->p, (float)b->nv);
- sub_v3_v3v3(b->p, b->p, co);
+ sub_v3_v3(b->p, co);
b->nv--;
mul_v3_fl(b->p, 1.0f / (float)b->nv);
}
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -3423,13 +3423,13 @@
nu->pntsu++;
if(mode=='e') {
- VECCOPY(newbezt->vec[0], bezt->vec[0]);
- VECCOPY(newbezt->vec[1], bezt->vec[1]);
- VECCOPY(newbezt->vec[2], bezt->vec[2]);
+ copy_v3_v3(newbezt->vec[0], bezt->vec[0]);
+ copy_v3_v3(newbezt->vec[1], bezt->vec[1]);
+ copy_v3_v3(newbezt->vec[2], bezt->vec[2]);
}
else {
- VECCOPY(newbezt->vec[1], location);
- sub_v3_v3v3(newbezt->vec[1],newbezt->vec[1], obedit->obmat[3]);
+ copy_v3_v3(newbezt->vec[1], location);
+ sub_v3_v3(newbezt->vec[1], obedit->obmat[3]);
mul_m3_v3(imat,newbezt->vec[1]);
sub_v3_v3v3(temp, newbezt->vec[1],temp);
add_v3_v3v3(newbezt->vec[0], bezt->vec[0],temp);
@@ -3471,11 +3471,11 @@
makeknots(nu, 1);
if(mode=='e') {
- VECCOPY(newbp->vec, bp->vec);
+ copy_v3_v3(newbp->vec, bp->vec);
}
else {
- VECCOPY(newbp->vec, location);
- sub_v3_v3v3(newbp->vec, newbp->vec, obedit->obmat[3]);
+ copy_v3_v3(newbp->vec, location);
+ sub_v3_v3(newbp->vec, obedit->obmat[3]);
mul_m3_v3(imat,newbp->vec);
newbp->vec[3]= 1.0;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -996,7 +996,7 @@
static void add_normal_aligned(float *nor, float *add)
{
if( INPR(nor, add) < -0.9999f)
- sub_v3_v3v3(nor, nor, add);
+ sub_v3_v3(nor, add);
else
add_v3_v3(nor, add);
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2010-04-23 23:01:50 UTC (rev 28394)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2010-04-23 23:57:00 UTC (rev 28395)
@@ -660,7 +660,7 @@
// initTransform(TFM_TRANSLATION, CTX_NO_PET|CTX_NO_MIRROR);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list