svn merge ^/trunk/blender -r41075:41099
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Oct 2011 01:09:00 +0000 (01:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Oct 2011 01:09:00 +0000 (01:09 +0000)
commit638a93b23550d9794230aabd52a9e6de7aa98979
tree1771b971a3e694d190c4ebc222f23c077e7cae94
parentef1a1e14511db251793e9f92572817986c048696
parentdc907ef876b128c9767394d00dfc719d55ba077e
svn merge ^/trunk/blender -r41075:41099
22 files changed:
CMakeLists.txt
intern/ghost/intern/GHOST_SystemSDL.h
intern/ghost/intern/GHOST_WindowSDL.h
release/datafiles/splash.png
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_marking.c
source/blender/editors/datafiles/splash.png.c
source/blender/editors/mesh/bmesh_selecthistory.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/python/mathutils/mathutils_Euler.c
source/blender/render/intern/include/raycounter.h