diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 10:06:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 10:06:17 +0400 |
| commit | b249255859cfe39244a1343af86797669f88abd2 (patch) | |
| tree | 43f68449bfe51f0251531287e1ef293ff1fee7a4 /source/blender/editors/mesh | |
| parent | fcd5bc147ca0c5ca9c6a9af3a0c0862f0acb91ef (diff) | |
fix own error in bmesh/openmp unhiding, set BM_OMP_LIMIT to 0 so we can spot these cases more easily (will change before release).
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 56acccaee45..e8132f5b82b 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1298,15 +1298,15 @@ void EDBM_mesh_reveal(BMEditMesh *em) int sels[3] = {(em->selectmode & SCE_SELECT_VERTEX), (em->selectmode & SCE_SELECT_EDGE), (em->selectmode & SCE_SELECT_FACE), }; - - BMIter iter; - BMElem *ele; int i; /* Use tag flag to remember what was hidden before all is revealed. * BM_ELEM_HIDDEN --> BM_ELEM_TAG */ #pragma omp parallel for schedule(dynamic) if (em->bm->totvert + em->bm->totedge + em->bm->totface >= BM_OMP_LIMIT) for (i = 0; i < 3; i++) { + BMIter iter; + BMElem *ele; + BM_ITER_MESH (ele, &iter, em->bm, iter_types[i]) { BM_elem_flag_set(ele, BM_ELEM_TAG, BM_elem_flag_test(ele, BM_ELEM_HIDDEN)); } @@ -1317,6 +1317,9 @@ void EDBM_mesh_reveal(BMEditMesh *em) /* Select relevant just-revealed elements */ for (i = 0; i < 3; i++) { + BMIter iter; + BMElem *ele; + if (!sels[i]) { continue; } |