griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bug fixing

Browse Source 
It helps if the fonction to wait on all threads actual does that.

Use user parameter for number of threads (this is really looking like it should be in the userprefs and not render params).
This commit is contained in:
Martin Poirier
2008-10-01 18:00:13 +00:00
parent ff096645ad
commit 39e66e4d6f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/intern/threads.c
View File

@@ -225,7 +225,6 @@ void BLI_remove_threads(ListBase *threadbase)
tslot->callerdata = NULL;
pthread_join(tslot->pthread, NULL);
tslot->avail = 1;
break;
}
}
}

14
source/blender/src/autoarmature.c
View File

@@ -78,7 +78,6 @@ struct RigNode;
struct RigArc;
struct RigEdge;
#define NB_THREADS 4
#define USE_THREADS
typedef struct RigGraph {
@@ -328,6 +327,8 @@ void RIG_freeRigGraph(BGraph *rg)
static RigGraph *newRigGraph()
{
RigGraph *rg;
int totthread;
rg = MEM_callocN(sizeof(RigGraph), "rig graph");
rg->head = NULL;
@@ -339,7 +340,16 @@ static RigGraph *newRigGraph()
rg->free_node = NULL;
#ifdef USE_THREADS
rg->worker = BLI_create_worker(exec_retargetArctoArc, NB_THREADS, 20); /* fix number of threads */
if(G.scene->r.mode & R_FIXED_THREADS)
{
totthread = G.scene->r.threads;
}
else
{
totthread = BLI_system_thread_count();
}
rg->worker = BLI_create_worker(exec_retargetArctoArc, totthread, 20); /* fix number of threads */
#endif
return rg;