diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-03 10:12:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-03 10:12:04 +0400 |
| commit | 817a96f243490e8a1c0eb1dff19a45e73a7b9e8b (patch) | |
| tree | 01882d127f1012940241154c17047b690747146d /source | |
| parent | be0d4f8e4566c8907b69a267f203f60842219058 (diff) | |
fix [#30735] bmesh: loop-cut cuts faces isolated by hidden faces
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_loopcut.c | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index df92324d3a3..f9758e3bf7f 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1023,9 +1023,9 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) /* editmesh-emulating function */ void BM_mesh_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float smooth, - float fractal, int beauty, int numcuts, - int seltype, int cornertype, int singleedge, - int gridfill, int seed) + float fractal, int beauty, int numcuts, + int seltype, int cornertype, int singleedge, + int gridfill, int seed) { BMOperator op; diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 638eaabbfd3..90698a79c25 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -206,7 +206,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) if (select) { BMW_init(&walker, em->bm, BMW_EDGERING, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, - BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ + BMW_FLAG_TEST_HIDDEN, BMW_NIL_LAY); eed = BMW_begin(&walker, startedge); @@ -220,7 +220,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) BMW_init(&walker, em->bm, BMW_EDGERING, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, - BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ + BMW_FLAG_TEST_HIDDEN, BMW_NIL_LAY); eed = startedge = BMW_begin(&walker, startedge); @@ -240,6 +240,8 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) edgering_find_order(em, lasteed, eed, lastv1, v); lastv1 = v[0][0]; + BLI_array_growitems(edges, previewlines); + for (i = 1; i <= previewlines; i++) { co[0][0] = (v[0][1]->co[0] - v[0][0]->co[0]) * (i / ((float)previewlines + 1)) + v[0][0]->co[0]; co[0][1] = (v[0][1]->co[1] - v[0][0]->co[1]) * (i / ((float)previewlines + 1)) + v[0][0]->co[1]; @@ -249,7 +251,6 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) co[1][1] = (v[1][1]->co[1] - v[1][0]->co[1]) * (i / ((float)previewlines + 1)) + v[1][0]->co[1]; co[1][2] = (v[1][1]->co[2] - v[1][0]->co[2]) * (i / ((float)previewlines + 1)) + v[1][0]->co[2]; - BLI_array_growone(edges); copy_v3_v3(edges[tot][0], co[0]); copy_v3_v3(edges[tot][1], co[1]); tot++; @@ -264,6 +265,8 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) edgering_find_order(em, lasteed, startedge, lastv1, v); + BLI_array_growitems(edges, previewlines); + for (i = 1; i <= previewlines; i++) { if (!v[0][0] || !v[0][1] || !v[1][0] || !v[1][1]) continue; @@ -276,7 +279,6 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) co[1][1] = (v[1][1]->co[1] - v[1][0]->co[1]) * (i / ((float)previewlines + 1)) + v[1][0]->co[1]; co[1][2] = (v[1][1]->co[2] - v[1][0]->co[2]) * (i / ((float)previewlines + 1)) + v[1][0]->co[2]; - BLI_array_growone(edges); copy_v3_v3(edges[tot][0], co[0]); copy_v3_v3(edges[tot][1], co[1]); tot++; |