Merging r49287 through r49299 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Jul 2012 15:12:58 +0000 (15:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Jul 2012 15:12:58 +0000 (15:12 +0000)
commit87a1d2935aa9fd8dbb4c2e354c6925c1ddf87744
treeef6c43ad540c0750763079e0c6ea6f9063133e18
parent0471ffe9a4739b67c72ceb155ecbcd9c6111d188
parent49e0c832e16195d8a656798830a63074eb6cd6c7
Merging r49287 through r49299 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/imbuf/intern/colormanagement.c
source/blender/imbuf/intern/divers.c