diff options
author | Martin Poirier <theeth@yahoo.com> | 2007-09-27 21:45:53 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2007-09-27 21:45:53 +0400 |
commit | 0345b3b221568d9c29665397ef42496c8199a05e (patch) | |
tree | 1713c8ee0dac014104eedbb5b305a32e20da06ee /source/blender/src/editmesh_mods.c | |
parent | 8c2ebc2decc22bb052242d7a305010b55fd52947 (diff) |
Improve consistency in editmesh tmp unions.
EditVert had "float *fp" while the others had "float p".
changed to "float p" and made all code using the float pointer use the already existing tmp.p (void*) instead.
Diffstat (limited to 'source/blender/src/editmesh_mods.c')
-rw-r--r-- | source/blender/src/editmesh_mods.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 2a86c674f66..5cfeab03c0a 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -3894,7 +3894,7 @@ void vertexsmooth(void) eve= em->verts.first; while(eve) { if(eve->f & SELECT) { - eve->tmp.fp = adr; + eve->tmp.p = (void*)adr; eve->f1= 0; eve->f2= 0; adr+= 3; @@ -3942,11 +3942,11 @@ void vertexsmooth(void) if((eed->v1->f & SELECT) && eed->v1->f1<255) { eed->v1->f1++; - VecAddf(eed->v1->tmp.fp, eed->v1->tmp.fp, fvec); + VecAddf(eed->v1->tmp.p, eed->v1->tmp.p, fvec); } if((eed->v2->f & SELECT) && eed->v2->f1<255) { eed->v2->f1++; - VecAddf(eed->v2->tmp.fp, eed->v2->tmp.fp, fvec); + VecAddf(eed->v2->tmp.p, eed->v2->tmp.p, fvec); } } eed= eed->next; @@ -3956,7 +3956,7 @@ void vertexsmooth(void) while(eve) { if(eve->f & SELECT) { if(eve->f1) { - adr = eve->tmp.fp; + adr = eve->tmp.p; fac= 0.5/(float)eve->f1; eve->co[0]= 0.5*eve->co[0]+fac*adr[0]; @@ -3976,7 +3976,7 @@ void vertexsmooth(void) } } } - eve->tmp.fp= 0; + eve->tmp.p= NULL; } eve= eve->next; } |