svn merge ^/trunk/blender -r42742:42757
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 08:09:46 +0000 (08:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 08:09:46 +0000 (08:09 +0000)
commit84b58df85a08813a5f216d702c3e48b564840bd8
treec644e3535207ed805ba048d20c7f60d31ed55cdb
parentefb4eff35312afb372e2a46aa598d12a74ff4a52
parent0be004bb2ff380c41365506ae3d8488ff2691a85
svn merge ^/trunk/blender -r42742:42757
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/intern/rna_scene.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp