diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 09:33:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 09:33:43 +0400 |
| commit | f11d5e19539afe46a758d7e2dd6b99db6e8d0c39 (patch) | |
| tree | 322f7fbb75e07b61f2083ea7b2004f71d58cd27c /source/blender/blenlib/intern/threads.c | |
| parent | cb890a49fbd653c71d2fe639265a1a562136113f (diff) | |
correct merge error
Diffstat (limited to 'source/blender/blenlib/intern/threads.c')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 4f3a4a4adf2..22c71189d90 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -352,13 +352,10 @@ 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 + else if (type == LOCK_SCANFILL) + pthread_mutex_lock(&_scanfill_lock); } void BLI_unlock_thread(int type) @@ -377,13 +374,10 @@ 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 + else if(type == LOCK_SCANFILL) + pthread_mutex_unlock(&_scanfill_lock); } /* Mutex Locks */ |