From baa843d0d3f9936f01bb569f3512972daaadd070 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 5 Feb 2012 13:25:42 +0000 Subject: Code Cleanup: use vector functions for copying / adding UV's --- source/blender/editors/uvedit/uvedit_draw.c | 6 ++---- source/blender/editors/uvedit/uvedit_ops.c | 14 +++++--------- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/uvedit') diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 9e2a2abe837..b081941e71b 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -194,8 +194,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - tf_uvorig[i][0] = luv->uv[0]; - tf_uvorig[i][1] = luv->uv[1]; + copy_v2_v2(tf_uvorig[i], luv->uv); i++; } @@ -245,8 +244,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - tf_uvorig[i][0] = luv->uv[0]; - tf_uvorig[i][1] = luv->uv[1]; + copy_v2_v2(tf_uvorig[i], luv->uv); i++; } diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 090752d7b02..5c21fa6c1c1 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -512,16 +512,14 @@ void poly_uv_center(BMEditMesh *em, BMFace *f, float cent[2]) MLoopUV *luv; BMIter liter; - cent[0] = cent[1] = 0.0f; + zero_v2(cent); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - cent[0] += luv->uv[0]; - cent[1] += luv->uv[1]; + add_v2_v2(cent, luv->uv); } - cent[0] /= (float) f->len; - cent[1] /= (float) f->len; + mul_v2_fl(cent, 1.0f / (float)f->len); } @@ -2951,8 +2949,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe if (BM_GetIndex(l->v) >= 0 && (!uvedit_uv_selected(em, scene, l))) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - coords[BM_GetIndex(l->v)*2] += luv->uv[0]; - coords[BM_GetIndex(l->v)*2+1] += luv->uv[1]; + add_v2_v2(&coords[BM_GetIndex(l->v) * 2], luv->uv); change = 1; } } @@ -2978,8 +2975,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe if (uvedit_uv_selected(em, scene, l) && BM_GetIndex(l->v) >= 0 && (users = usercount[BM_GetIndex(l->v)])) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - luv->uv[0] = coords[BM_GetIndex(l->v)*2]; - luv->uv[1] = coords[BM_GetIndex(l->v)*2+1]; + copy_v2_v2(luv->uv, &coords[BM_GetIndex(l->v) * 2]); } } } -- cgit v1.2.3