svn merge ^/trunk/blender -r41602:41638 .
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 02:57:28 +0000 (02:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 02:57:28 +0000 (02:57 +0000)
35 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/CMakeLists.txt
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_ui_api.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -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
        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
Simple merge
  #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"
@@@ -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);
@@@ -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)
                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 */
  #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"
  #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"
  
@@@ -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"
  #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"
@@@ -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"
Simple merge
Simple merge
Simple merge
  #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[];