svn merge ^/trunk/blender -r48749:48754
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 Jul 2012 12:57:04 +0000 (12:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 Jul 2012 12:57:04 +0000 (12:57 +0000)
commitc185635ed07a8909a5cf8537530899b5ec48afcd
tree480ca29f2baf384ab945403b23f18f64b4c0b283
parent4e6a54e60b714780a58d01a5ab19bd86586886da
parentfacb1512c097189e50808f6aca7c9f0b0280d2dc
svn merge ^/trunk/blender -r48749:48754
source/blender/blenkernel/intern/image.c