svn merge ^/trunk/blender -r42292:42303
authorCampbell Barton <ideasman42@gmail.com>
Thu, 1 Dec 2011 00:34:59 +0000 (00:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 1 Dec 2011 00:34:59 +0000 (00:34 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_bake.c