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/editors/armature/editarmature_retarget.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/editors/armature/editarmature_retarget.c')
| -rw-r--r-- | source/blender/editors/armature/editarmature_retarget.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index a6ee2a2acad..687455495a1 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -40,6 +40,7 @@ #include "BKE_constraint.h" #include "BKE_armature.h" #include "BKE_context.h" +#include "BKE_scene.h" #include "ED_armature.h" #include "ED_util.h" @@ -283,14 +284,8 @@ static RigGraph *newRigGraph(void) rg->free_node = NULL; #ifdef USE_THREADS -// if (G.scene->r.mode & R_FIXED_THREADS) -// { -// totthread = G.scene->r.threads; -// } -// else -// { + //totthread = BKE_scene_num_threads(G.scene); totthread = BLI_system_thread_count(); -// } rg->worker = BLI_create_worker(exec_retargetArctoArc, totthread, 20); /* fix number of threads */ #endif |