svn merge ^/trunk/blender -r41602:41638 .

diff --cc CMakeLists.txt
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d.py
Simple merge

diff --cc source/blender/CMakeLists.txt
Simple merge

diff --cc source/blender/blenkernel/BKE_blender.h
Simple merge

diff --cc source/blender/blenkernel/CMakeLists.txt
index 82a179eac4ad5df6b88d42d423b92101ed23b5a9,c21806b4bc10528d9e5359feb3479b4aa65835a7..22ffbcbdd46cefaf93215f254535a50219139b06
--- 1/source/blender/blenkernel/CMakeLists.txt
--- 2/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -114,7 -112,7 +114,8 @@@ set(SR
        intern/mesh.c
        intern/mesh_validate.c
        intern/modifier.c
 +      intern/modifiers_bmesh.c
+       intern/movieclip.c
        intern/multires.c
        intern/nla.c
        intern/node.c
@@@ -223,9 -223,9 +226,10 @@@
        BKE_speaker.h
        BKE_subsurf.h
        BKE_suggestions.h
 +      BKE_tessmesh.h
        BKE_text.h
        BKE_texture.h
+       BKE_tracking.h
        BKE_unit.h
        BKE_utildefines.h
        BKE_world.h

diff --cc source/blender/blenkernel/SConscript
Simple merge

diff --cc source/blender/blenkernel/intern/constraint.c
index 56f92b442274400bee74720bbec9fe6a12e4bbf1,f904d6e66df6982ea18384d574696b0de9169163..3e14dbe39da04ad512e6df6953602ac3039d7a20
--- 1/source/blender/blenkernel/intern/constraint.c
--- 2/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@@ -70,10 -75,10 +75,14 @@@
  #include "BKE_global.h"
  #include "BKE_library.h"
  #include "BKE_idprop.h"
 +#include "BKE_mesh.h"
  #include "BKE_shrinkwrap.h"
  #include "BKE_mesh.h"
 +#include "BKE_tessmesh.h"
++#include "BKE_tracking.h"
++#include "BKE_movieclip.h"
+ #include "BKE_tracking.h"
+ #include "BKE_movieclip.h"
  
  #ifdef WITH_PYTHON
  #include "BPY_extern.h"

diff --cc source/blender/blenkernel/intern/library.c
Simple merge

diff --cc source/blender/blenkernel/intern/object.c
Simple merge

diff --cc source/blender/blenlib/BLI_threads.h
index bd911adeba27d5957e7ea54d007fb51e60d15e73,1c9c9188e4487a360ce05960cdc26d134a7f7f8d..6dd666842d00c06a26a3f6424ec5edc7572ff736
--- 1/source/blender/blenlib/BLI_threads.h
--- 2/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@@ -71,7 -71,7 +71,8 @@@ int           BLI_system_thread_count(void); /* 
  #define LOCK_RCACHE           4
  #define LOCK_OPENGL           5
  #define LOCK_NODES            6
- #define LOCK_SCANFILL 7
+ #define LOCK_MOVIECLIP        7
++#define LOCK_SCANFILL 8
  
  void  BLI_lock_thread(int type);
  void  BLI_unlock_thread(int type);

diff --cc source/blender/blenlib/intern/threads.c
index f80458682e186c39c485edbedf7a8f560d4496c7,8247b861a7a2eb13a04abef3c8fe7b0127961d38..4f3a4a4adf2317d12bb482090b55e394c9839e0f
--- 1/source/blender/blenlib/intern/threads.c
--- 2/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@@ -114,7 -114,7 +114,8 @@@ static pthread_mutex_t _custom1_lock = 
  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 -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 -371,8 +377,13 @@@
                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 */

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/include/ED_view3d.h
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/space_api/spacetypes.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
index 6f40f28ea5ca119a6048b478de60b64825812c34,4809e463d7520fb83589dddceb1c237eba453873..a297f9bdf0fe4868aae66aa74a1f726111ed3134
--- 1/source/blender/editors/space_view3d/drawobject.c
--- 2/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -77,9 -76,9 +77,11 @@@
  #include "BKE_pointcache.h"
  #include "BKE_scene.h"
  #include "BKE_unit.h"
+ #include "BKE_movieclip.h"
+ #include "BKE_tracking.h"
  
 +#include "BKE_tessmesh.h"
 +
  #include "smoke_API.h"
  
  #include "IMB_imbuf.h"

diff --cc source/blender/editors/space_view3d/space_view3d.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_select.c
index d719ac188e518598d50bd16b492e75a8ce8fd592,0163c29c9aa4d405261866e33d78a6f60cf9abe8..29c7f2cc7fd41f0774681e4e716373d55c2978b1
--- 1/source/blender/editors/space_view3d/view3d_select.c
--- 2/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@@ -60,8 -61,11 +61,11 @@@
  #include "BKE_context.h"
  #include "BKE_paint.h"
  #include "BKE_armature.h"
 +#include "BKE_tessmesh.h"
+ #include "BKE_movieclip.h"
+ #include "BKE_object.h"
+ #include "BKE_tracking.h"
  
 -
  #include "BIF_gl.h"
  #include "BIF_glutil.h"
  

diff --cc source/blender/editors/space_view3d/view3d_snap.c
index ed5c480643ccdaeeae54f6cd0dfe8cbbe58c6c9e,012e08f98cb896ee37090b7038438a4868059aa2..582ee56961ae41fac5bbb717f5f46f2289637382
--- 1/source/blender/editors/space_view3d/view3d_snap.c
--- 2/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@@ -55,8 -55,7 +55,9 @@@
  #include "BKE_lattice.h"
  #include "BKE_main.h"
  #include "BKE_object.h"
 +#include "BKE_tessmesh.h"
 +#include "BKE_DerivedMesh.h"
+ #include "BKE_tracking.h"
  
  #include "WM_api.h"
  #include "WM_types.h"

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/editors/transform/transform.h
Simple merge

diff --cc source/blender/editors/transform/transform_conversions.c
index d391289df159f17add7f55470baefc1ece89503e,0a6f49f7c9f3d6dd5ee58ffadba9448d2cb753d4..b104c5bb513d7dcf997fe0db1e014fb9d2654326
--- 1/source/blender/editors/transform/transform_conversions.c
--- 2/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@@ -72,9 -73,11 +73,12 @@@
  #include "BKE_sequencer.h"
  #include "BKE_pointcache.h"
  #include "BKE_bmesh.h"
 +#include "BKE_tessmesh.h"
  #include "BKE_scene.h"
  #include "BKE_report.h"
+ #include "BKE_tracking.h"
+ #include "BKE_movieclip.h"
+ #include "BKE_node.h"
  
  
  #include "ED_anim_api.h"

diff --cc source/blender/editors/transform/transform_generics.c
index 09a4e366611fd88375f4c35137965257858996cd,53e379a2d270a345d34718dded9d67b86a27f4bf..409dbdf33afd38e62c2bce325b3f0c888976d104
--- 1/source/blender/editors/transform/transform_generics.c
--- 2/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -70,7 -71,7 +71,8 @@@
  #include "BKE_mesh.h"
  #include "BKE_nla.h"
  #include "BKE_context.h"
 +#include "BKE_tessmesh.h"
+ #include "BKE_tracking.h"
  
  #include "ED_anim_api.h"
  #include "ED_armature.h"

diff --cc source/blender/editors/util/CMakeLists.txt
Simple merge

diff --cc source/blender/makesdna/DNA_modifier_types.h
Simple merge

diff --cc source/blender/makesdna/DNA_userdef_types.h
Simple merge

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_ui_api.c
Simple merge

diff --cc source/blenderplayer/CMakeLists.txt
Simple merge

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge

diff --cc source/creator/creator.c
index c9b8b82054aafbb488242b0c4f0c380a16fb706e,1f6f4d85f437426154f7ba8f6a79b67de3907343..7e9e433598b863cfe2fa9ad1ee4e9e311bc84b80
--- 1/source/creator/creator.c
--- 2/source/creator/creator.c
+++ b/source/creator/creator.c
@@@ -122,8 -120,10 +122,12 @@@
  #include "binreloc.h"
  #endif
  
+ #ifdef WITH_LIBMV
+ #include "libmv-capi.h"
+ #endif
+ 
 +static int no_handler = 0;
 +
  // from buildinfo.c
  #ifdef BUILD_DATE
  extern char build_date[];