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)
commit25098c741b4ee227b4d63ab3d56bb5e829305612
tree828123dc905853398b260c923b3b2614e282c7de
parent89e390f28fee42c266b0297684a2ef8661473676
parentb6021462a8855a2ae1ecd03f61014060c3702888
svn merge ^/trunk/blender -r42292:42303
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_bake.c