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)
commit002b66e06abbd8b4aaaa864f2eaf5ff38b3ba5db
treead43959c92719d7e80b5aad773bd0b22f0143a57
parentbd2cb7ae50bbd7b172a941fbb75fc6d5b5015953
parentf8db7ccb62cf2dbd26d4b6d9b89d6b3839a2b96a
svn merge ^/trunk/blender -r50076:50080
source/blender/blenkernel/intern/image.c
source/blender/editors/space_image/image_buttons.c