svn merge ^/trunk/blender -r42886:42902
authorCampbell Barton <ideasman42@gmail.com>
Tue, 27 Dec 2011 13:28:30 +0000 (13:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 27 Dec 2011 13:28:30 +0000 (13:28 +0000)
commit38f8c897e70a30de4b3801122eafcab12b6084f2
tree001cd51b1969640c7fd9ac9af813779f1a20c850
parentde14457abfc66c3cb3d90963022bea78bf57db7f
parent0059b8dd96bf065406441112f604e59f65d844d6
svn merge ^/trunk/blender -r42886:42902
CMakeLists.txt
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/creator/CMakeLists.txt