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)
commitd6a617ff06207a8a4079a484347cf98e88715077
tree1a8f331734170c2dc4f673f11469ace55931692e
parent6a5d8e355d731b7943bf4bf174f1c106da4c1f1c
parent7a13bc2196336c4ec45e86947d9fcb0b8d61f74e
Merging r50248 through r50264 from trunk into soc-2011-tomato
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