diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
| commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
| tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/editors/transform/transform_orientations.c | |
| parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
| parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) | |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/editors/transform/transform_orientations.c')
| -rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index af9c03af1b6..bdd7c633df2 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -598,7 +598,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMFace *efa; BMIter iter; - BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { add_v3_v3(normal, efa->no); sub_v3_v3v3(vec, @@ -615,7 +615,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; float cotangent[3]; - BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; @@ -639,7 +639,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMEdge *eed = NULL; BMIter iter; - BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { sub_v3_v3v3(plane, eed->v2->co, eed->v1->co); break; @@ -653,7 +653,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMEdge *eed = NULL; BMIter iter; - BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { /* use average vert normals as plane and edge vector as normal */ copy_v3_v3(plane, eed->v1->no); @@ -668,7 +668,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMVert *v1 = NULL, *v2 = NULL; BMIter iter; - BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; @@ -688,7 +688,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], else if (em->bm->totvertsel == 1) { BMIter iter; - BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { copy_v3_v3(normal, eve->no); break; @@ -701,7 +701,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], zero_v3(normal); - BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { add_v3_v3(normal, eve->no); } |