svn merge ^/trunk/blender -r43918:43934
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Feb 2012 22:21:41 +0000 (22:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Feb 2012 22:21:41 +0000 (22:21 +0000)
commitb0f9d3a8afe9aa6acac2911389d003c327e52e56
treef6a94e2660b73bb9eccece3396d60d61bc964f4e
parenta36ccba3a8bfcdb9415e0d27735ebd36eec8b16a
parent297a21c39a9b33337b168b32adf0538b11d56510
svn merge ^/trunk/blender -r43918:43934
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/space_image.c