svn merge ^/trunk/blender -r47413:47423
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 16:56:51 +0000 (16:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 16:56:51 +0000 (16:56 +0000)
commit2202aaa083b99a4c37c20fbaf34e370d4e78c839
tree8f3dc2efc3ea2db257723c686fa0341e57996cf3
parent0d50a364ed73ef0517188a5672472ca481d0eff4
parent68a9dd54ec909d8e56da0da487c6ec3559551edd
svn merge ^/trunk/blender -r47413:47423
source/blender/blenloader/intern/readfile.c