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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/space_image.c