svn merge ^/trunk/blender -r42927:42931
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:05:02 +0000 (14:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:05:02 +0000 (14:05 +0000)
commitbf4deba4d5bdbad8611d2fdd7f796fe785cac4a5
treecde0748edb0f4860d354a75067e6fd64034604d6
parent07afa420f2f273c58d6d054b9026c92e0ac98785
parent5b88e16306711408825d9291bfeb7023bd7fd69c
svn merge ^/trunk/blender -r42927:42931
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/windowmanager/intern/wm_operators.c