diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-22 13:49:26 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-22 13:49:26 +0300 |
| commit | 434ae40d635907c1d4f82b65fac1efaebfc5401b (patch) | |
| tree | 1d76a33dc88611ebaded9426adc70358d353779d /source/blender/depsgraph | |
| parent | 94e69a379e83f058244ca163e9e745fa0112dff7 (diff) | |
| parent | be6479c9ea5d36451e552ceb10d2106d9a5d6856 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 74fa003821a..17096931e57 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -325,6 +325,10 @@ void DEG_evaluate_on_refresh_ex(EvaluationContext *eval_ctx, TaskScheduler *task_scheduler = BLI_task_scheduler_get(); TaskPool *task_pool = BLI_task_pool_create(task_scheduler, &state); + if (G.debug & G_DEBUG_DEPSGRAPH_NO_THREADS) { + BLI_pool_set_num_threads(task_pool, 1); + } + calculate_pending_parents(graph, layers); /* Clear tags. */ |