Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-09 10:04:17 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-09 10:04:17 +0400
commitdfdfa3d51b48a6bffd90779a1778dcf0e9a751e4 (patch)
treef51a4ea8668ee41182a5d60942e96804004d3c7a /source/blender/editors/mesh/meshtools.c
parent42517463821d0d0bbebe7c45bf40c06f4d8e9261 (diff)
code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs.
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
-rw-r--r--source/blender/editors/mesh/meshtools.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index f44af97d403..44d923a009b 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -357,7 +357,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
/* copy this mesh's shapekey to the destination shapekey (need to transform first) */
fp2= ((float *)(okb->data));
for(a=0; a < me->totvert; a++, fp1+=3, fp2+=3) {
- VECCOPY(fp1, fp2);
+ copy_v3_v3(fp1, fp2);
mul_m4_v3(cmat, fp1);
}
}
@@ -365,7 +365,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
/* copy this mesh's vertex coordinates to the destination shapekey */
mv= mvert;
for(a=0; a < me->totvert; a++, fp1+=3, mv++) {
- VECCOPY(fp1, mv->co);
+ copy_v3_v3(fp1, mv->co);
}
}
}
@@ -387,14 +387,14 @@ int join_mesh_exec(bContext *C, wmOperator *op)
/* copy this mesh's shapekey to the destination shapekey */
fp2= ((float *)(okb->data));
for(a=0; a < me->totvert; a++, fp1+=3, fp2+=3) {
- VECCOPY(fp1, fp2);
+ copy_v3_v3(fp1, fp2);
}
}
else {
/* copy base-coordinates to the destination shapekey */
mv= mvert;
for(a=0; a < me->totvert; a++, fp1+=3, mv++) {
- VECCOPY(fp1, mv->co);
+ copy_v3_v3(fp1, mv->co);
}
}
}
@@ -813,7 +813,7 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
}
/* for quick unit coordinate calculus */
- VECCOPY(MeshOctree.offs, min);
+ copy_v3_v3(MeshOctree.offs, min);
MeshOctree.offs[0]-= MOC_THRESH; /* we offset it 1 threshold unit extra */
MeshOctree.offs[1]-= MOC_THRESH;
MeshOctree.offs[2]-= MOC_THRESH;