svn merge ^/trunk/blender -r41200:41226 .
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 08:45:55 +0000 (08:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 08:45:55 +0000 (08:45 +0000)
13 files changed:
1  2 
CMakeLists.txt
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/object/object_transform.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform_conversions.c
source/blender/render/SConscript
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
index ae9ef2c4dfdbe4db983d7b8387a35c1c2146938d,df2a7787f797da994a21e9b65011d1d4d2167d1d..e7f5dce14e9003866b0092087bedc94f6a597bef
@@@ -56,9 -54,7 +56,8 @@@
  #include "BKE_material.h"
  #include "BKE_paint.h"
  #include "BKE_property.h"
 +#include "BKE_tessmesh.h"
  
  #include "BIF_gl.h"
  #include "BIF_glutil.h"
  
Simple merge