diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-02 20:48:14 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-02 20:48:14 +0300 |
| commit | d2fbbed4620c7dff4117f07864ca8ce64740cc95 (patch) | |
| tree | 28c2f7f96a7a995efa67ba6724c638b917bdad08 | |
| parent | 15fb2bd477fb97ad6510482af00a7ff58271acd7 (diff) | |
Attempt to fix win32 compilation after own recent commits.
| -rw-r--r-- | source/blender/blenlib/intern/task.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index 3374a589fc3..b37bb4366ea 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -347,6 +347,7 @@ static TaskPool *task_pool_create_ex(TaskScheduler *scheduler, void *userdata, c TaskPool *pool = MEM_callocN(sizeof(TaskPool), "TaskPool"); #ifndef NDEBUG +# ifndef WIN32 /* WIN32 pthread_t seems to ba a struct, no direct comparison available, *sigh* */ /* Assert we do not try to create a background pool from some parent task - those only work OK from main thread. */ if (is_background) { const pthread_t thread_id = pthread_self(); @@ -356,6 +357,7 @@ static TaskPool *task_pool_create_ex(TaskScheduler *scheduler, void *userdata, c BLI_assert(scheduler->threads[i] != thread_id); } } +# endif #endif pool->scheduler = scheduler; |