svn merge ^/trunk/blender -r48937:48953
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 08:48:06 +0000 (08:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 08:48:06 +0000 (08:48 +0000)
commit284d9422f4a5950713d85538de0070ff262bd35d
treedd2c118579f0fa490d1318ab1a075f5db2597f60
parent0c087e5154f9d0c381966c27b1c7e7cd6180c4ba
parent4cacff234225d81c44144551fd295a24a9b3c30c
svn merge ^/trunk/blender -r48937:48953
build_files/cmake/macros.cmake
source/blender/makesdna/DNA_mask_types.h
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt