diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
| commit | cb890a49fbd653c71d2fe639265a1a562136113f (patch) | |
| tree | 10ddd1f7198c85408f83794fe560caa9512e2a2e /source/blender/blenlib/intern/threads.c | |
| parent | aea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (diff) | |
| parent | f086201518b85f6dd2ae60ae37dc14f1d1406c01 (diff) | |
svn merge ^/trunk/blender -r41602:41638 .
Diffstat (limited to 'source/blender/blenlib/intern/threads.c')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index f80458682e1..4f3a4a4adf2 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -114,6 +114,7 @@ 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 _movieclip_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 */ @@ -351,8 +352,13 @@ void BLI_lock_thread(int type) pthread_mutex_lock(&_opengl_lock); else if (type==LOCK_NODES) pthread_mutex_lock(&_nodes_lock); +<<<<<<< .working else if (type == LOCK_SCANFILL) pthread_mutex_lock(&_scanfill_lock); +======= + else if (type==LOCK_MOVIECLIP) + pthread_mutex_lock(&_movieclip_lock); +>>>>>>> .merge-right.r41638 } void BLI_unlock_thread(int type) @@ -371,8 +377,13 @@ void BLI_unlock_thread(int type) pthread_mutex_unlock(&_opengl_lock); else if(type==LOCK_NODES) pthread_mutex_unlock(&_nodes_lock); +<<<<<<< .working else if(type == LOCK_SCANFILL) pthread_mutex_unlock(&_scanfill_lock); +======= + else if(type==LOCK_MOVIECLIP) + pthread_mutex_unlock(&_movieclip_lock); +>>>>>>> .merge-right.r41638 } /* Mutex Locks */ |