diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:38:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:38:21 +0400 |
| commit | 85540d5aa7abb487e546b5483fffeef2e6075af5 (patch) | |
| tree | 61e47f78a9cbf29683434fa20c8a5f5d73da979e /source/blender/modifiers | |
| parent | 7c88bc5952c7e9f8a7f48d00d94b335bd0169c2e (diff) | |
more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_simpledeform.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index f93e0469686..509c916941f 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -257,7 +257,7 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob, mul_qt_v3(state.rot,mv->co); if(pimd->flag & eParticleInstanceFlag_UseSize) mul_v3_fl(mv->co, size[i/totvert]); - VECADD(mv->co,mv->co,state.co); + add_v3_v3(mv->co, state.co); } mface=result->getFaceArray(result); diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 4609ee221a4..2c056ad4021 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -198,7 +198,7 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object for(i=0; i<numVerts; i++) { float tmp[3]; - VECCOPY(tmp, vertexCos[i]); + copy_v3_v3(tmp, vertexCos[i]); if(transf) space_transform_apply(transf, tmp); @@ -236,7 +236,7 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object if(transf) space_transform_apply(transf, vertexCos[i]); - VECCOPY(co, vertexCos[i]); + copy_v3_v3(co, vertexCos[i]); //Apply axis limits if(smd->mode != MOD_SIMPLEDEFORM_MODE_BEND) //Bend mode shoulnt have any lock axis |