[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41640] branches/bmesh/blender/source/ blender/blenlib/intern/threads.c: correct merge error

[Campbell Barton]

Revision: 41640
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41640
Author:   campbellbarton
Date:     2011-11-08 05:33:43 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
correct merge error

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenlib/intern/threads.c

Modified: branches/bmesh/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/threads.c      
2011-11-08 02:57:28 UTC (rev 41639)
+++ branches/bmesh/blender/source/blender/blenlib/intern/threads.c      
2011-11-08 05:33:43 UTC (rev 41640)
@@ -352,13 +352,10 @@
                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 @@
                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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs