Merging r49261 through r49263 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 18:05:42 +0000 (18:05 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 18:05:42 +0000 (18:05 +0000)
1  2 
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_scene.c