svn merge ^/trunk/blender -r48375:48378
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 15:41:44 +0000 (15:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 15:41:44 +0000 (15:41 +0000)
1  2 
source/blender/blenkernel/intern/image.c