svn merge ^/trunk/blender -r50076:50080
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 11:11:43 +0000 (11:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 11:11:43 +0000 (11:11 +0000)
1  2 
source/blender/blenkernel/intern/image.c
source/blender/editors/space_image/image_buttons.c