diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-06 06:59:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-06 06:59:25 +0400 |
| commit | e045e324a47fcaf5c5fd13bbb165cabe9c1051bf (patch) | |
| tree | 3d2e2bd7378b9d3088cc259ba57e5e903f737cbd /source/blender/editors/mesh/editmesh_tools.c | |
| parent | fbeeec7bd02c86ad419f440c7e5b5ce283a88cb8 (diff) | |
error in recent gridfill commit, calculating span last failed.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 048b5cab295..75ff5256e10 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2919,14 +2919,6 @@ static void edbm_fill_grid_prepare(BMesh *bm, int offset, int *r_span, bool span BLI_rotatelist_first(verts, v_act_link); BM_edgeloop_edges_get(el_store, edges); - /* un-flag 'rails' */ - for (i = 0; i < span; i++) { - BM_elem_flag_disable(edges[i], BM_ELEM_TAG); - BM_elem_flag_disable(edges[(verts_len / 2) + i], BM_ELEM_TAG); - } - - MEM_freeN(edges); - if (span_calc) { /* calculate the span by finding the next corner in 'verts' @@ -2960,7 +2952,6 @@ static void edbm_fill_grid_prepare(BMesh *bm, int offset, int *r_span, bool span if (BM_elem_flag_test(v, BM_ELEM_TAG)) { if (v != v_act) { span = i; - // printf("Span found %d\n", span); break; } } @@ -2969,6 +2960,13 @@ static void edbm_fill_grid_prepare(BMesh *bm, int offset, int *r_span, bool span } /* end span calc */ + + /* un-flag 'rails' */ + for (i = 0; i < span; i++) { + BM_elem_flag_disable(edges[i], BM_ELEM_TAG); + BM_elem_flag_disable(edges[(verts_len / 2) + i], BM_ELEM_TAG); + } + MEM_freeN(edges); } /* else let the bmesh-operator handle it */ |