svn merge ^/trunk/blender -r42197:42221
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Nov 2011 17:09:13 +0000 (17:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Nov 2011 17:09:13 +0000 (17:09 +0000)
commit063dd4f60aa0fb0a93e1fb8e450ab83b98b8df83
treede946c0d42157b01fcdea59517972d0475ae651d
parent173b956ea2df41b0f78f4ea670fca1aa115653e1
parentc126bfba82dd434e2478d0ce4e5cf095f98b0c9a
svn merge ^/trunk/blender -r42197:42221
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/editmesh_tools.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/CMakeLists.txt