Revision: 41600
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41600
Author: campbellbarton
Date: 2011-11-07 01:38:32 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy
functions for int & char.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenlib/BLI_math_vector.h
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_info/textview.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/util/crazyspace.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/render/intern/include/rendercore.h
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-06 21:05:58 UTC (rev 41599)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-07 01:38:32 UTC (rev 41600)
@@ -152,7 +152,7 @@
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
- VECCOPY(co_r, cddm->mvert[index].co);
+ copy_v3_v3(co_r, cddm->mvert[index].co);
}
static void cdDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
@@ -161,7 +161,7 @@
int i;
for(i = 0; i < dm->numVertData; i++, mv++)
- VECCOPY(cos_r[i], mv->co);
+ copy_v3_v3(cos_r[i], mv->co);
}
static void cdDM_getVertNo(DerivedMesh *dm, int index, float no_r[3])
@@ -1246,39 +1246,39 @@
if( numdata != 0 ) {
offset = 0;
if(attribs.totorco) {
- VECCOPY((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v2]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v3]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v2]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v3]);
offset += sizeof(float)*3;
}
for(b = 0; b < attribs.tottface; b++) {
MTFace *tf =
&attribs.tface[b].array[a];
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset],tf->uv[0]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset],tf->uv[0]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
offset += sizeof(float)*2;
}
for(b = 0; b < attribs.totmcol; b++) {
MCol *cp =
&attribs.mcol[b].array[a*4 + 0];
GLubyte col[4];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset], (char *)col);
cp = &attribs.mcol[b].array[a*4
+ 1];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
cp = &attribs.mcol[b].array[a*4
+ 2];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize*2], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
offset += sizeof(unsigned
char)*4;
}
if(attribs.tottang) {
float *tang =
attribs.tang.array[a*4 + 0];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset], tang);
tang = attribs.tang.array[a*4 +
1];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
tang = attribs.tang.array[a*4 +
2];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset += sizeof(float)*4;
}
(void)offset;
@@ -1288,38 +1288,38 @@
if( numdata != 0 ) {
offset = 0;
if(attribs.totorco) {
- VECCOPY((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v4]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v1]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v4]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v1]);
offset +=
sizeof(float)*3;
}
for(b = 0; b <
attribs.tottface; b++) {
MTFace *tf =
&attribs.tface[b].array[a];
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset],tf->uv[2]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset],tf->uv[2]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
offset +=
sizeof(float)*2;
}
for(b = 0; b < attribs.totmcol;
b++) {
MCol *cp =
&attribs.mcol[b].array[a*4 + 2];
GLubyte col[4];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset], (char *)col);
cp =
&attribs.mcol[b].array[a*4 + 3];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
cp =
&attribs.mcol[b].array[a*4 + 0];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize*2], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
offset +=
sizeof(unsigned char)*4;
}
if(attribs.tottang) {
float *tang =
attribs.tang.array[a*4 + 2];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset], tang);
tang =
attribs.tang.array[a*4 + 3];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
tang =
attribs.tang.array[a*4 + 0];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset +=
sizeof(float)*4;
}
(void)offset;
@@ -1439,7 +1439,7 @@
else
orig = i;
- VECCOPY(cent, mv[mf->v1].co);
+ copy_v3_v3(cent, mv[mf->v1].co);
add_v3_v3(cent, mv[mf->v2].co);
add_v3_v3(cent, mv[mf->v3].co);
@@ -1625,7 +1625,7 @@
i++, eve = eve->next, index++) {
MVert *mv = &mvert[i];
- VECCOPY(mv->co, eve->co);
+ copy_v3_v3(mv->co, eve->co);
normal_float_to_short_v3(mv->no, eve->no);
mv->bweight = (unsigned char) (eve->bweight * 255.0f);
@@ -1793,7 +1793,7 @@
cddm->mvert = vert;
for(i = 0; i < dm->numVertData; ++i, ++vert)
- VECCOPY(vert->co, vertCoords[i]);
+ copy_v3_v3(vert->co, vertCoords[i]);
}
void CDDM_apply_vert_normals(DerivedMesh *dm, short (*vertNormals)[3])
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-06
21:05:58 UTC (rev 41599)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-07
01:38:32 UTC (rev 41600)
@@ -183,8 +183,8 @@
if(cfra1 == cfra2)
return;
- VECCOPY(keys[1].co, bp->pos);
- VECCOPY(keys[1].vel, bp->vec);
+ copy_v3_v3(keys[1].co, bp->pos);
+ copy_v3_v3(keys[1].vel, bp->vec);
if(old_data) {
memcpy(keys[2].co, old_data, 3 * sizeof(float));
@@ -202,8 +202,8 @@
mul_v3_fl(keys->vel, 1.0f / dfra);
- VECCOPY(bp->pos, keys->co);
- VECCOPY(bp->vec, keys->vel);
+ copy_v3_v3(bp->pos, keys->co);
+ copy_v3_v3(bp->vec, keys->vel);
}
static int ptcache_softbody_totpoint(void *soft_v, int UNUSED(cfra))
{
@@ -483,8 +483,8 @@
if(cfra1 == cfra2)
return;
- VECCOPY(keys[1].co, vert->x);
- VECCOPY(keys[1].vel, vert->v);
+ copy_v3_v3(keys[1].co, vert->x);
+ copy_v3_v3(keys[1].vel, vert->v);
if(old_data) {
memcpy(keys[2].co, old_data, 3 * sizeof(float));
@@ -502,8 +502,8 @@
mul_v3_fl(keys->vel, 1.0f / dfra);
- VECCOPY(vert->x, keys->co);
- VECCOPY(vert->v, keys->vel);
+ copy_v3_v3(vert->x, keys->co);
+ copy_v3_v3(vert->v, keys->vel);
/* should vert->xconst be interpolated somehow too? - jahka */
}
@@ -2126,7 +2126,7 @@
}
void BKE_ptcache_id_time(PTCacheID *pid, Scene *scene, float cfra, int
*startframe, int *endframe, float *timescale)
{
- Object *ob;
+ /* Object *ob; */ /* UNUSED */
PointCache *cache;
/* float offset; unused for now */
float time, nexttime;
@@ -2143,7 +2143,7 @@
* is probably to interpolate results from two frames for that ..
*/
- ob= pid->ob;
+ /* ob= pid->ob; */ /* UNUSED */
cache= pid->cache;
if(timescale) {
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2011-11-06
21:05:58 UTC (rev 41599)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2011-11-07
01:38:32 UTC (rev 41600)
@@ -167,13 +167,11 @@
//Convert the vertex to tree coordinates
- if(calc->vert)
- {
- VECCOPY(tmp_co, calc->vert[i].co);
+ if(calc->vert) {
+ copy_v3_v3(tmp_co, calc->vert[i].co);
}
- else
- {
- VECCOPY(tmp_co, co);
+ else {
+ copy_v3_v3(tmp_co, co);
}
space_transform_apply(&calc->local2target, tmp_co);
@@ -198,7 +196,7 @@
if(dist > FLT_EPSILON) weight *= (dist -
calc->keepDist)/dist;
//Convert the coordinates back to mesh coordinates
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
