svn merge ^/trunk/blender -r49854:49867
authorCampbell Barton <ideasman42@gmail.com>
Mon, 13 Aug 2012 09:35:11 +0000 (09:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 13 Aug 2012 09:35:11 +0000 (09:35 +0000)
commit41b0ec6c94c0cb5accb975b3489060e5bb379923
tree29632bf3db20780140fb3f3c2e78878161e2d84b
parentcacf56c97ba485fdd6eb93a4fe340ffb3869020d
parentdd2f172fc4e0418e9bce14e53ff27aaa98d6ccba
svn merge ^/trunk/blender -r49854:49867
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/node_draw.c
source/blender/imbuf/IMB_imbuf.h
source/blender/imbuf/intern/divers.c
source/blender/makesdna/DNA_node_types.h