svn merge ^/trunk/blender -r48527:48537
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 14:05:18 +0000 (14:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 14:05:18 +0000 (14:05 +0000)
commit1fb0ecb9bbcf8d7594102696c2bf24398ca07f25
tree5f2276b2410b08eae9647d29fdf3376f00fa9f44
parent259e78997a50e4be6ed4f2eda7f128c892ad51ca
parent42aaa47e9b01d6dd7f2cf73f754652233438bffe
svn merge ^/trunk/blender -r48527:48537
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_node/drawnode.c