diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 06:01:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 06:01:09 +0400 |
| commit | e08c4a00d230d3a09a8f3ab25256100113db36b7 (patch) | |
| tree | 3edb6f5efc008c3f8f623d430a9884846651115b /source/blender/blenlib/intern/threads.c | |
| parent | 1a2188af41b272506e3b58129f178db2172d053f (diff) | |
| parent | a5959e767e1fce78fa1876e8791667a377ac51f1 (diff) | |
svn merge -r41371:41420 ^/trunk/blender
Diffstat (limited to 'source/blender/blenlib/intern/threads.c')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 37f37887688..f80458682e1 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -113,6 +113,7 @@ static pthread_mutex_t _viewer_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _custom1_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _rcache_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _opengl_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t _nodes_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _scanfill_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_t mainid; static int thread_levels= 0; /* threads can be invoked inside threads */ @@ -348,6 +349,8 @@ void BLI_lock_thread(int type) pthread_mutex_lock(&_rcache_lock); else if (type==LOCK_OPENGL) pthread_mutex_lock(&_opengl_lock); + else if (type==LOCK_NODES) + pthread_mutex_lock(&_nodes_lock); else if (type == LOCK_SCANFILL) pthread_mutex_lock(&_scanfill_lock); } @@ -366,6 +369,8 @@ void BLI_unlock_thread(int type) pthread_mutex_unlock(&_rcache_lock); else if(type==LOCK_OPENGL) pthread_mutex_unlock(&_opengl_lock); + else if(type==LOCK_NODES) + pthread_mutex_unlock(&_nodes_lock); else if(type == LOCK_SCANFILL) pthread_mutex_unlock(&_scanfill_lock); } |