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)
1  2 
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

Simple merge