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/modifiers | |
parent | f7717b2e80907a974b472d0ee786f63b06efa40c (diff) |
replace add_v3_v3v3() --> add_v3_v3() where possible
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 8 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_smooth.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 447862b6f49..505fcdc43d5 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -225,7 +225,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, maxVerts = dm->getNumVerts(dm); if(amd->offset_type & MOD_ARR_OFF_CONST) - add_v3_v3v3(offset[3], offset[3], amd->offset); + add_v3_v3(offset[3], amd->offset); if(amd->offset_type & MOD_ARR_OFF_RELATIVE) { for(j = 0; j < 3; j++) offset[3][j] += amd->scale[j] * vertarray_size(src_mvert, diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 3f97dfc150c..b745d396a48 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -243,7 +243,7 @@ static void sphere_do( if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); } else { - add_v3_v3v3(tmp_co, tmp_co, center); + add_v3_v3(tmp_co, center); } } @@ -287,7 +287,7 @@ static void sphere_do( if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); } else { - add_v3_v3v3(tmp_co, tmp_co, center); + add_v3_v3(tmp_co, center); } } @@ -489,7 +489,7 @@ static void cuboid_do( if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); } else { - add_v3_v3v3(tmp_co, tmp_co, center); + add_v3_v3(tmp_co, center); } } @@ -557,7 +557,7 @@ static void cuboid_do( if(flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); } else { - add_v3_v3v3(tmp_co, tmp_co, center); + add_v3_v3(tmp_co, center); } } diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 12f46d01e01..a45ee19b68d 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -149,9 +149,9 @@ static void createFacepa(ExplodeModifierData *emd, /* set face-particle-indexes to nearest particle to face center */ for(i=0,fa=mface; i<totface; i++,fa++){ add_v3_v3v3(center,mvert[fa->v1].co,mvert[fa->v2].co); - add_v3_v3v3(center,center,mvert[fa->v3].co); + add_v3_v3(center, mvert[fa->v3].co); if(fa->v4){ - add_v3_v3v3(center,center,mvert[fa->v4].co); + add_v3_v3(center, mvert[fa->v4].co); mul_v3_fl(center,0.25); } else diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 052d4641e2f..a42bf8abbaf 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -144,11 +144,11 @@ static void smoothModifier_do( if (uctmp[idx1] < 255) { uctmp[idx1]++; - add_v3_v3v3(v1, v1, fvec); + add_v3_v3(v1, fvec); } if (uctmp[idx2] < 255) { uctmp[idx2]++; - add_v3_v3v3(v2, v2, fvec); + add_v3_v3(v2, fvec); } } |