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/blenkernel/intern | |
parent | f7717b2e80907a974b472d0ee786f63b06efa40c (diff) |
replace add_v3_v3v3() --> add_v3_v3() where possible
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 20 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/boids.c | 28 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sketch.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
15 files changed, 73 insertions, 73 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 36cf19364ef..8a74ba1be53 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -583,14 +583,14 @@ static void emDM__calcFaceCent(EditFace *efa, float cent[3], float (*vertexCos)[ { if (vertexCos) { VECCOPY(cent, vertexCos[(int) efa->v1->tmp.l]); - add_v3_v3v3(cent, cent, vertexCos[(int) efa->v2->tmp.l]); - add_v3_v3v3(cent, cent, vertexCos[(int) efa->v3->tmp.l]); - if (efa->v4) add_v3_v3v3(cent, cent, vertexCos[(int) efa->v4->tmp.l]); + add_v3_v3(cent, vertexCos[(int) efa->v2->tmp.l]); + add_v3_v3(cent, vertexCos[(int) efa->v3->tmp.l]); + if (efa->v4) add_v3_v3(cent, vertexCos[(int) efa->v4->tmp.l]); } else { VECCOPY(cent, efa->v1->co); - add_v3_v3v3(cent, cent, efa->v2->co); - add_v3_v3v3(cent, cent, efa->v3->co); - if (efa->v4) add_v3_v3v3(cent, cent, efa->v4->co); + add_v3_v3(cent, efa->v2->co); + add_v3_v3(cent, efa->v3->co); + if (efa->v4) add_v3_v3(cent, efa->v4->co); } if (efa->v4) { @@ -1369,15 +1369,15 @@ static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob, float *v4 = vertexCos[(int) efa->v4->tmp.l]; normal_quad_v3( no,v1, v2, v3, v4); - add_v3_v3v3(emdm->vertexNos[(int) efa->v4->tmp.l], emdm->vertexNos[(int) efa->v4->tmp.l], no); + add_v3_v3(emdm->vertexNos[(int) efa->v4->tmp.l], no); } else { normal_tri_v3( no,v1, v2, v3); } - add_v3_v3v3(emdm->vertexNos[(int) efa->v1->tmp.l], emdm->vertexNos[(int) efa->v1->tmp.l], no); - add_v3_v3v3(emdm->vertexNos[(int) efa->v2->tmp.l], emdm->vertexNos[(int) efa->v2->tmp.l], no); - add_v3_v3v3(emdm->vertexNos[(int) efa->v3->tmp.l], emdm->vertexNos[(int) efa->v3->tmp.l], no); + add_v3_v3(emdm->vertexNos[(int) efa->v1->tmp.l], no); + add_v3_v3(emdm->vertexNos[(int) efa->v2->tmp.l], no); + add_v3_v3(emdm->vertexNos[(int) efa->v3->tmp.l], no); } for(i=0, eve= em->verts.first; eve; i++, eve=eve->next) { diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 1040784284f..253da25b871 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1251,12 +1251,12 @@ static void blend_pose_offset_bone(bActionStrip *strip, bPose *dst, bPose *src, /* if blending, we only add with factor scrweight */ mul_v3_fl(vec, srcweight); - add_v3_v3v3(dst->cyclic_offset, dst->cyclic_offset, vec); + add_v3_v3(dst->cyclic_offset, vec); } } } - add_v3_v3v3(dst->cyclic_offset, dst->cyclic_offset, src->cyclic_offset); + add_v3_v3(dst->cyclic_offset, src->cyclic_offset); } /* added "sizecorr" here, to allow armatures to be scaled and still have striding. @@ -1616,7 +1616,7 @@ static void do_nla(Scene *scene, Object *ob, int blocktype) } else if(blocktype==ID_AR) { /* apply stride offset to object */ - add_v3_v3v3(ob->obmat[3], ob->obmat[3], ob->pose->stride_offset); + add_v3_v3(ob->obmat[3], ob->pose->stride_offset); } /* free */ diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index c6120ace850..34dcf41d441 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -730,7 +730,7 @@ static void vertex_dupli__mapFunc(void *userData, int index, float *co, float *n VECCOPY(vec, co); mul_m4_v3(vdd->pmat, vec); sub_v3_v3v3(vec, vec, vdd->pmat[3]); - add_v3_v3v3(vec, vec, vdd->obmat[3]); + add_v3_v3(vec, vdd->obmat[3]); copy_m4_m4(obmat, vdd->obmat); VECCOPY(obmat[3], vec); @@ -990,7 +990,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa mul_m4_v3(pmat, cent); sub_v3_v3v3(cent, cent, pmat[3]); - add_v3_v3v3(cent, cent, ob__obmat[3]); + add_v3_v3(cent, ob__obmat[3]); copy_m4_m4(obmat, ob__obmat); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index b5b554789fb..dbc03176b8f 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -852,7 +852,7 @@ static float dist_bone_deform(bPoseChannel *pchan, float *vec, DualQuat *dq, flo // 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_v3v3(vec, vec, cop); + add_v3_v3(vec, cop); if(mat) pchan_deform_mat_add(pchan, fac, bbonemat, mat); @@ -1108,7 +1108,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, mul_v3m3_dq( dco, (defMats)? summat: NULL,dq); sub_v3_v3v3(dco, dco, co); mul_v3_fl(dco, armature_weight); - add_v3_v3v3(co, co, dco); + add_v3_v3(co, dco); } else mul_v3m3_dq( co, (defMats)? summat: NULL,dq); @@ -2262,7 +2262,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha nor[0] = BLI_gNoise(amod->noisesize, size[0]+ofs, size[1], size[2], 0, 0) - ofs; nor[1] = BLI_gNoise(amod->noisesize, size[0], size[1]+ofs, size[2], 0, 0) - ofs; nor[2] = BLI_gNoise(amod->noisesize, size[0], size[1], size[2]+ofs, 0, 0) - ofs; - add_v3_v3v3(size, size, nor); + add_v3_v3(size, nor); if (sizeo[0] != 0) mul_v3_fl(pchan->pose_mat[0], size[0] / sizeo[0]); @@ -2278,7 +2278,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha nor[2] = BLI_gNoise(amod->noisesize, eul[0], eul[1], eul[2]+ofs, 0, 0) - ofs; compatible_eul(nor, eulo); - add_v3_v3v3(eul, eul, nor); + add_v3_v3(eul, nor); compatible_eul(eul, eulo); loc_eul_size_to_mat4(pchan->pose_mat, loc, eul, size); @@ -2381,7 +2381,7 @@ void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, float cti /* only rootbones get the cyclic offset (unless user doesn't want that) */ if ((bone->flag & BONE_NO_CYCLICOFFSET) == 0) - add_v3_v3v3(pchan->pose_mat[3], pchan->pose_mat[3], ob->pose->cyclic_offset); + add_v3_v3(pchan->pose_mat[3], ob->pose->cyclic_offset); } if(do_extra) { diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 25c42dfbf49..b18ab8767e3 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -141,7 +141,7 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, get_effector_data(eff, &efd, &epoint, 1); mul_v3_fl(efd.vel, efd.distance / (val->max_speed * bbd->timestep)); - add_v3_v3v3(efd.loc, efd.loc, efd.vel); + add_v3_v3(efd.loc, efd.vel); sub_v3_v3v3(efd.vec_to_point, pa->prev_state.co, efd.loc); efd.distance = len_v3(efd.vec_to_point); } @@ -355,7 +355,7 @@ static int rule_separate(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Pa if(neighbors > 1 && ptn[1].dist!=0.0f) { sub_v3_v3v3(vec, pa->prev_state.co, bbd->sim->psys->particles[ptn[1].index].state.co); mul_v3_fl(vec, (2.0f * val->personal_space * pa->size - ptn[1].dist) / ptn[1].dist); - add_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec); + add_v3_v3(bbd->wanted_co, vec); bbd->wanted_speed = val->max_speed; len = ptn[1].dist; ret = 1; @@ -372,7 +372,7 @@ static int rule_separate(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Pa if(neighbors > 0 && ptn[0].dist < len) { sub_v3_v3v3(vec, pa->prev_state.co, ptn[0].co); mul_v3_fl(vec, (2.0f * val->personal_space * pa->size - ptn[0].dist) / ptn[1].dist); - add_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec); + add_v3_v3(bbd->wanted_co, vec); bbd->wanted_speed = val->max_speed; len = ptn[0].dist; ret = 1; @@ -393,8 +393,8 @@ static int rule_flock(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti if(neighbors > 1) { for(n=1; n<neighbors; n++) { - add_v3_v3v3(loc, loc, bbd->sim->psys->particles[ptn[n].index].prev_state.co); - add_v3_v3v3(vec, vec, bbd->sim->psys->particles[ptn[n].index].prev_state.vel); + add_v3_v3(loc, bbd->sim->psys->particles[ptn[n].index].prev_state.co); + add_v3_v3(vec, bbd->sim->psys->particles[ptn[n].index].prev_state.vel); } mul_v3_fl(loc, 1.0f/((float)neighbors - 1.0f)); @@ -403,8 +403,8 @@ static int rule_flock(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Parti sub_v3_v3v3(loc, loc, pa->prev_state.co); sub_v3_v3v3(vec, vec, pa->prev_state.vel); - add_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec); - add_v3_v3v3(bbd->wanted_co, bbd->wanted_co, loc); + add_v3_v3(bbd->wanted_co, vec); + add_v3_v3(bbd->wanted_co, loc); bbd->wanted_speed = len_v3(bbd->wanted_co); ret = 1; @@ -567,7 +567,7 @@ static int rule_average_speed(BoidRule *rule, BoidBrainData *bbd, BoidValues *va mul_v3_fl(bbd->wanted_co, 1.1f); - add_v3_v3v3(bbd->wanted_co, bbd->wanted_co, vec); + add_v3_v3(bbd->wanted_co, vec); /* leveling */ if(asbr->level > 0.0f && psys_uses_gravity(bbd->sim)) { @@ -748,7 +748,7 @@ static Object *boid_find_ground(BoidBrainData *bbd, ParticleData *pa, float *gro /* take surface velocity into account */ closest_point_on_surface(surmd, pa->state.co, x, NULL, v); - add_v3_v3v3(x, x, v); + add_v3_v3(x, v); /* get actual position on surface */ closest_point_on_surface(surmd, x, ground_co, ground_nor, NULL); @@ -767,7 +767,7 @@ static Object *boid_find_ground(BoidBrainData *bbd, ParticleData *pa, float *gro VECCOPY(col.co1, pa->state.co); VECCOPY(col.co2, pa->state.co); - add_v3_v3v3(col.co1, col.co1, zvec); + add_v3_v3(col.co1, zvec); sub_v3_v3v3(col.co2, col.co2, zvec); sub_v3_v3v3(ray_dir, col.co2, col.co1); col.t = 0.0f; @@ -956,7 +956,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa) int n = 0; for(rule = state->rules.first; rule; rule=rule->next) { if(apply_boid_rule(bbd, rule, &val, pa, -1.0f)) { - add_v3_v3v3(wanted_co, wanted_co, bbd->wanted_co); + add_v3_v3(wanted_co, bbd->wanted_co); wanted_speed += bbd->wanted_speed; n++; bbd->wanted_co[0]=bbd->wanted_co[1]=bbd->wanted_co[2]=bbd->wanted_speed=0.0f; @@ -1205,7 +1205,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) mul_v3_fl(force, length); } - add_v3_v3v3(acc, acc, force); + add_v3_v3(acc, force); /* store smoothed acceleration for nice banking etc. */ VECADDFAC(bpa->data.acc, bpa->data.acc, acc, dtime); @@ -1222,8 +1222,8 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) VECCOPY(bvec, pa->prev_state.vel); mul_v3_fl(bvec, dtime); - add_v3_v3v3(dvec, dvec, bvec); - add_v3_v3v3(pa->state.co, pa->state.co, dvec); + add_v3_v3(dvec, bvec); + add_v3_v3(pa->state.co, dvec); VECADDFAC(pa->state.vel, pa->state.vel, acc, dtime); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index b3e702ceee9..204ff2a0369 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1347,12 +1347,12 @@ static void cdDM_foreachMappedFaceCenter( orig = i; VECCOPY(cent, mv[mf->v1].co); - add_v3_v3v3(cent, cent, mv[mf->v2].co); - add_v3_v3v3(cent, cent, mv[mf->v3].co); + add_v3_v3(cent, mv[mf->v2].co); + add_v3_v3(cent, mv[mf->v3].co); if (mf->v4) { normal_quad_v3( no,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co, mv[mf->v4].co); - add_v3_v3v3(cent, cent, mv[mf->v4].co); + add_v3_v3(cent, mv[mf->v4].co); mul_v3_fl(cent, 0.25f); } else { normal_tri_v3( no,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co); @@ -1750,11 +1750,11 @@ void CDDM_calc_normals(DerivedMesh *dm) else normal_tri_v3( f_no,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co); - add_v3_v3v3(temp_nors[mf->v1], temp_nors[mf->v1], f_no); - add_v3_v3v3(temp_nors[mf->v2], temp_nors[mf->v2], f_no); - add_v3_v3v3(temp_nors[mf->v3], temp_nors[mf->v3], f_no); + add_v3_v3(temp_nors[mf->v1], f_no); + add_v3_v3(temp_nors[mf->v2], f_no); + add_v3_v3(temp_nors[mf->v3], f_no); if(mf->v4) - add_v3_v3v3(temp_nors[mf->v4], temp_nors[mf->v4], f_no); + add_v3_v3(temp_nors[mf->v4], f_no); } /* normalize vertex normals and assign */ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index c23f34e919a..a07fc4ada39 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -447,8 +447,8 @@ static void contarget_get_mesh_mat (Scene *scene, Object *ob, char *substring, f if (dvert[i].dw[j].def_nr == dgroup) { dm->getVertCo(dm, i, co); dm->getVertNo(dm, i, nor); - add_v3_v3v3(vec, vec, co); - add_v3_v3v3(normal, normal, nor); + add_v3_v3(vec, co); + add_v3_v3(normal, nor); count++; break; } @@ -535,7 +535,7 @@ static void contarget_get_lattice_mat (Object *ob, char *substring, float mat[][ else memcpy(tvec, bp->vec, 3*sizeof(float)); - add_v3_v3v3(vec, vec, tvec); + add_v3_v3(vec, tvec); grouped++; break; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index ac635e5f45a..d744baac84a 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -196,10 +196,10 @@ void addnormalsDispList(Object *ob, ListBase *lb) normal_quad_v3( nor,v1, v3, v4, v2); - add_v3_v3v3(n1, n1, nor); - add_v3_v3v3(n2, n2, nor); - add_v3_v3v3(n3, n3, nor); - add_v3_v3v3(n4, n4, nor); + add_v3_v3(n1, nor); + add_v3_v3(n2, nor); + add_v3_v3(n3, nor); + add_v3_v3(n4, nor); v2= v1; v1+= 3; v4= v3; v3+= 3; diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 00659b2be9e..a0416bc2b34 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -576,10 +576,10 @@ int closest_point_on_surface(SurfaceModifierData *surmd, float *co, float *surfa MFace *mface = CDDM_get_face(surmd->dm, nearest.index); VECCOPY(surface_vel, surmd->v[mface->v1].co); - add_v3_v3v3(surface_vel, surface_vel, surmd->v[mface->v2].co); - add_v3_v3v3(surface_vel, surface_vel, surmd->v[mface->v3].co); + add_v3_v3(surface_vel, surmd->v[mface->v2].co); + add_v3_v3(surface_vel, surmd->v[mface->v3].co); if(mface->v4) - add_v3_v3v3(surface_vel, surface_vel, surmd->v[mface->v4].co); + add_v3_v3(surface_vel, surmd->v[mface->v4].co); mul_v3_fl(surface_vel, mface->v4 ? 0.25f : 0.333f); } @@ -600,7 +600,7 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin /* using velocity corrected location allows for easier sliding over effector surface */ copy_v3_v3(vec, point->vel); mul_v3_fl(vec, point->vel_to_frame); - add_v3_v3v3(vec, vec, point->loc); + add_v3_v3(vec, point->loc); ret = closest_point_on_surface(eff->surmd, vec, efd->loc, efd->nor, real_velocity ? efd->vel : NULL); @@ -827,7 +827,7 @@ static void do_texture_effector(EffectorCache *eff, EffectorData *efd, EffectedP VECADDFAC(force, force, efd->nor, fac); } - add_v3_v3v3(total_force, total_force, force); + add_v3_v3(total_force, force); } void do_physical_effector(EffectorCache *eff, EffectorData *efd, EffectedPoint *point, float *total_force) { @@ -874,7 +874,7 @@ void do_physical_effector(EffectorCache *eff, EffectorData *efd, EffectedPoint * mul_v3_fl(force, strength * efd->falloff); VECADDFAC(temp, temp, point->vel, -point->vel_to_sec); - add_v3_v3v3(force, force, temp); + add_v3_v3(force, temp); } break; case PFIELD_MAGNET: @@ -893,7 +893,7 @@ void do_physical_effector(EffectorCache *eff, EffectorData *efd, EffectedPoint * mul_v3_fl(force, -strength * efd->falloff); copy_v3_v3(temp, point->vel); mul_v3_fl(temp, -damp * 2.0f * (float)sqrt(fabs(strength)) * point->vel_to_sec); - add_v3_v3v3(force, force, temp); + add_v3_v3(force, temp); break; case PFIELD_CHARGE: mul_v3_fl(force, point->charge * strength * efd->falloff); @@ -950,7 +950,7 @@ void do_physical_effector(EffectorCache *eff, EffectorData *efd, EffectedPoint * if(pd->f_flow != 0.0f) { VECADDFAC(dave, dave, point->ave, -pd->f_flow * efd->falloff); } - add_v3_v3v3(point->ave, point->ave, dave); + add_v3_v3(point->ave, dave); } } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index fd4a8a00216..6ddc4b8bb16 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1233,11 +1233,11 @@ void mesh_calc_normals(MVert *mverts, int numVerts, MFace *mfaces, int numFaces, else normal_tri_v3( f_no,mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co); - add_v3_v3v3(tnorms[mf->v1], tnorms[mf->v1], f_no); - add_v3_v3v3(tnorms[mf->v2], tnorms[mf->v2], f_no); - add_v3_v3v3(tnorms[mf->v3], tnorms[mf->v3], f_no); + add_v3_v3(tnorms[mf->v1], f_no); + add_v3_v3(tnorms[mf->v2], f_no); + add_v3_v3(tnorms[mf->v3], f_no); if (mf->v4) - add_v3_v3v3(tnorms[mf->v4], tnorms[mf->v4], f_no); + add_v3_v3(tnorms[mf->v4], f_no); } for (i=0; i<numVerts; i++) { MVert *mv= &mverts[i]; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index bad1ebc6305..c1baced8f05 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1813,7 +1813,7 @@ static void ob_parbone(Object *ob, Object *par, float mat[][4]) /* but for backwards compatibility, the child has to move to the tail */ VECCOPY(vec, mat[1]); mul_v3_fl(vec, pchan->bone->length); - add_v3_v3v3(mat[3], mat[3], vec); + add_v3_v3(mat[3], vec); } static void give_parvert(Object *par, int nr, float *vec) @@ -1851,7 +1851,7 @@ static void give_parvert(Object *par, int nr, float *vec) vindex= (index)? index[i]: i; if(vindex == nr) { - add_v3_v3v3(vec, vec, mvert[i].co); + add_v3_v3(vec, mvert[i].co); count++; } } @@ -1960,7 +1960,7 @@ static void ob_parvert3(Object *ob, Object *par, float mat[][4]) } else { add_v3_v3v3(mat[3], v1, v2); - add_v3_v3v3(mat[3], mat[3], v3); + add_v3_v3(mat[3], v3); mul_v3_fl(mat[3], 0.3333333f); } } @@ -2342,7 +2342,7 @@ void minmax_object(Object *ob, float *min, float *max) DO_MINMAX(ob->obmat[3], min, max); VECCOPY(vec, ob->obmat[3]); - add_v3_v3v3(vec, vec, ob->size); + add_v3_v3(vec, ob->size); DO_MINMAX(vec, min, max); VECCOPY(vec, ob->obmat[3]); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index e1b91b7cc5a..31378e3a80a 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2126,7 +2126,7 @@ static void do_path_effectors(ParticleSimulationData *sim, int i, ParticleCacheK mul_v3_fl(force, effector*pow((float)k / (float)steps, 100.0f * sim->psys->part->eff_hair) / (float)steps); - add_v3_v3v3(force, force, vec); + add_v3_v3(force, vec); normalize_v3(force); diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c index ecafd0881ad..6032a0eea3d 100644 --- a/source/blender/blenkernel/intern/sketch.c +++ b/source/blender/blenkernel/intern/sketch.c @@ -260,7 +260,7 @@ void sk_straightenStroke(SK_Stroke *stk, int start, int end, float p_start[3], f VECCOPY(p, delta_p); mul_v3_fl(p, delta); - add_v3_v3v3(p, p, p_start); + add_v3_v3(p, p_start); } } @@ -337,7 +337,7 @@ void sk_flattenStroke(SK_Stroke *stk, int start, int end) mul_v3_fl(offset, d); sub_v3_v3v3(p, p, distance); - add_v3_v3v3(p, p, offset); + add_v3_v3(p, offset); } } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index e6f500aab15..b8274940318 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1580,7 +1580,7 @@ static void _scan_for_ext_spring_forces(Scene *scene, Object *ob, float timenow, if (ob->softflag & OB_SB_EDGECOLL){ if ( sb_detect_edge_collisionCached (sb->bpoint[bs->v1].pos , sb->bpoint[bs->v2].pos, &damp,feedback,ob->lay,ob,timenow)){ - add_v3_v3v3(bs->ext_force,bs->ext_force,feedback); + add_v3_v3(bs->ext_force, feedback); bs->flag |= BSF_INTERSECT; //bs->cf=damp; bs->cf=sb->choke*0.01f; @@ -1605,7 +1605,7 @@ static void _scan_for_ext_spring_forces(Scene *scene, Object *ob, float timenow, pdDoEffectors(do_effector, NULL, sb->effector_weights, &epoint, force, speed); mul_v3_fl(speed,windfactor); - add_v3_v3v3(vel,vel,speed); + add_v3_v3(vel, speed); } /* media in rest */ else{ @@ -2291,7 +2291,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo float gravity[3]; VECCOPY(gravity, scene->physics_settings.gravity); mul_v3_fl(gravity, sb_grav_force_scale(ob)*_final_mass(ob,bp)*sb->effector_weights->global_gravity); /* individual mass of node here */ - add_v3_v3v3(bp->force, bp->force, gravity); + add_v3_v3(bp->force, gravity); } /* particle field & vortex */ @@ -2358,7 +2358,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo for(b=bp->nofsprings;b>0;b--){ bs = sb->bspring + bp->springs[b-1]; if (do_springcollision || do_aero){ - add_v3_v3v3(bp->force,bp->force,bs->ext_force); + add_v3_v3(bp->force, bs->ext_force); if (bs->flag & BSF_INTERSECT) bp->choke = bs->cf; @@ -2799,7 +2799,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa for(b=bp->nofsprings;b>0;b--){ bs = sb->bspring + bp->springs[b-1]; if (do_springcollision || do_aero){ - add_v3_v3v3(bp->force,bp->force,bs->ext_force); + add_v3_v3(bp->force, bs->ext_force); if (bs->flag & BSF_INTERSECT) bp->choke = bs->cf; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 16cb671f2d0..db63f094160 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2679,7 +2679,7 @@ void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]) } for (i=0; i<numFaces; i++) { CCGFace *f = ccgSubSurf_getVertFace(v, i); - add_v3_v3v3(face_sum, face_sum, ccgSubSurf_getFaceCenterData(f)); + add_v3_v3(face_sum, ccgSubSurf_getFaceCenterData(f)); } /* ad-hoc correction for boundary vertices, to at least avoid them |