diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-09-18 03:05:33 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-09-18 03:05:33 +0400 |
| commit | 0c65f27c796393e9aa8a3d5ba44c574e6ec878d4 (patch) | |
| tree | c74b1e46e10ad21c734e08fbe265a2a1264dba47 /source/blender/editors/uvedit/uvedit_draw.c | |
| parent | b2c16fb401b0242bf840c9b080c134696c937dc3 (diff) | |
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_draw.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_draw.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 8ec87976064..c011e6e63de 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -48,6 +48,7 @@ #include "BLI_arithb.h" #include "BLI_editVert.h" +#include "BLI_array.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -166,8 +167,8 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe MTexPoly *tf; MLoopUV *luv; Image *ima= sima->image; - V_DECLARE(tf_uv); - V_DECLARE(tf_uvorig); + BLI_array_declare(tf_uv); + BLI_array_declare(tf_uvorig); float aspx, aspy, col[4], (*tf_uv)[2] = NULL, (*tf_uvorig)[2] = NULL; int i; @@ -181,14 +182,14 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - V_RESET(tf_uv); - V_RESET(tf_uvorig); + BLI_array_empty(tf_uv); + BLI_array_empty(tf_uvorig); i = 0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - V_GROW(tf_uv); - V_GROW(tf_uvorig); + BLI_array_growone(tf_uv); + BLI_array_growone(tf_uvorig); tf_uvorig[i][0] = luv->uv[0]; tf_uvorig[i][1] = luv->uv[1]; @@ -232,14 +233,14 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe if(BMINDEX_GET(efa)) { area = BM_face_area(efa) / totarea; - V_RESET(tf_uv); - V_RESET(tf_uvorig); + BLI_array_empty(tf_uv); + BLI_array_empty(tf_uvorig); i = 0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - V_GROW(tf_uv); - V_GROW(tf_uvorig); + BLI_array_growone(tf_uv); + BLI_array_growone(tf_uvorig); tf_uvorig[i][0] = luv->uv[0]; tf_uvorig[i][1] = luv->uv[1]; |