svn merge ^/trunk/blender -r47398:47413
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 15:28:38 +0000 (15:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2012 15:28:38 +0000 (15:28 +0000)
commit0d50a364ed73ef0517188a5672472ca481d0eff4
tree36ed794bdb468f2c9bd9b98d1ce49f883c9455c2
parentf8266d5a4b0d76faad90df8a285c1a070ecd8e9e
parent8e01389a4e34b81c28aea7ac7fbb590b314624e3
svn merge ^/trunk/blender -r47398:47413
source/blender/blenloader/intern/readfile.c