diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
| commit | 4a157de23d43c22abec8bd6922f0355334e413f8 (patch) | |
| tree | c8ca75fef261ce1316ea9042aa4bd689aa4eb584 /source/blender/blenlib/intern/threads.c | |
| parent | dbdb58f2a3c0d086afabdacab40c4d83c79e1a04 (diff) | |
| parent | bc593cac2354c863f074d9d51cffb3dca9f499a3 (diff) | |
svn merge ^/trunk/blender -r40587:40643
Diffstat (limited to 'source/blender/blenlib/intern/threads.c')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 7604c2b8b0e..6442f0947b8 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -219,7 +219,8 @@ static void *tslot_thread_start(void *tslot_p) return tslot->do_thread(tslot->callerdata); } -int BLI_thread_is_main(void) { +int BLI_thread_is_main(void) +{ return pthread_equal(pthread_self(), mainid); } |