svn merge ^/trunk/blender -r48378:48406
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 13:11:44 +0000 (13:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 13:11:44 +0000 (13:11 +0000)
commite6469eb1784d1a2774737d97c08799bedd83d920
tree14838ce2d8d30308556befdbc9ba5b92d87adb6c
parent5a540dec5ef60aa6d5dfe945c7dd2df81f3e9ce6
parent4f294a8f02949a85cb85e054836626e9c2584944
svn merge ^/trunk/blender -r48378:48406
source/blender/blenkernel/intern/image.c