Merging r50248 through r50264 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Aug 2012 12:49:10 +0000 (12:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Aug 2012 12:49:10 +0000 (12:49 +0000)
1  2 
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/image.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_nodetree.c

Simple merge