diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-12 21:56:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-12 21:59:15 +0300 |
| commit | e2715b129c1e62c8076ab4a212634b2a99cd8bc3 (patch) | |
| tree | 4a479cce089a648d705083e3bfba5663454f825a /source/blender/editors/sculpt_paint | |
| parent | a934da6bce97e3e25bca0d03aeae186b3984865a (diff) | |
Final OMP -> BLI_task commit for sculpt code.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 28fe526e952..0c16041b141 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -41,6 +41,7 @@ #include "BLI_string.h" #include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_task.h" #include "BLI_threads.h" #include "DNA_meshdata_types.h" @@ -265,6 +266,13 @@ static int sculpt_undo_restore_mask(bContext *C, DerivedMesh *dm, SculptUndoNode return 1; } +static void sculpt_undo_bmesh_restore_generic_task_cb(void *userdata, void *UNUSED(userdata_chunk), int n) +{ + PBVHNode **nodes = userdata; + + BKE_pbvh_node_mark_redraw(nodes[n]); +} + static void sculpt_undo_bmesh_restore_generic(bContext *C, SculptUndoNode *unode, Object *ob, @@ -280,21 +288,14 @@ static void sculpt_undo_bmesh_restore_generic(bContext *C, } if (unode->type == SCULPT_UNDO_MASK) { - int i, totnode; + int totnode; PBVHNode **nodes; - -#ifdef _OPENMP Sculpt *sd = CTX_data_tool_settings(C)->sculpt; -#else - (void)C; -#endif BKE_pbvh_search_gather(ss->pbvh, NULL, NULL, &nodes, &totnode); -#pragma omp parallel for schedule(guided) if ((sd->flags & SCULPT_USE_OPENMP) && totnode > SCULPT_OMP_LIMIT) - for (i = 0; i < totnode; i++) { - BKE_pbvh_node_mark_redraw(nodes[i]); - } + BLI_task_parallel_range_ex(0, totnode, nodes, NULL, 0, sculpt_undo_bmesh_restore_generic_task_cb, + ((sd->flags & SCULPT_USE_OPENMP) && totnode > SCULPT_OMP_LIMIT), false); if (nodes) MEM_freeN(nodes); |