diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 17:23:17 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 17:23:17 +0400 |
commit | a07dcd67ebf63fad08536b1e78bbb61e18fa51e6 (patch) | |
tree | 7c96f23349f005187e87d19d23248bb40d4d2e91 /source/blender/blenkernel/intern/particle_system.c | |
parent | 3e763d7e4dbbc4acb3deb7afb95e936ce950ebb5 (diff) |
Fix #35240: command line -t number of threads option did not work for cycles.
Now it works for blender internal, cycles and other multithreading code in
Blender in both background and UI mode.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 74a50389cd5..a2ba09dd6af 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1439,12 +1439,7 @@ ParticleThread *psys_threads_create(ParticleSimulationData *sim) { ParticleThread *threads; ParticleThreadContext *ctx; - int i, totthread; - - if (sim->scene->r.mode & R_FIXED_THREADS) - totthread= sim->scene->r.threads; - else - totthread= BLI_system_thread_count(); + int i, totthread = BKE_scene_num_threads(sim->scene); threads= MEM_callocN(sizeof(ParticleThread)*totthread, "ParticleThread"); ctx= MEM_callocN(sizeof(ParticleThreadContext), "ParticleThreadContext"); |