From f11d5e19539afe46a758d7e2dd6b99db6e8d0c39 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 8 Nov 2011 05:33:43 +0000 Subject: correct merge error --- source/blender/blenlib/intern/threads.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'source/blender/blenlib/intern/threads.c') 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 */ -- cgit v1.2.3