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)
commit70bf00a74c1688e857e3ca1b143b4d7a57a30655
tree8015eb2525a1aeca9c77fcbdf8fe222fff67948d
parentdbe2fe5043b99f8a5717bbe5b6a9e36a6519f8c7
parentf1cea89d99f0c80bdccd2ba1359142b5ff14cdb9
svn merge ^/trunk/blender -r41200:41226 .
13 files changed:
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