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)
commitf6b542aeb21c730e68de8ea8fb5ae2d50868cd30
treec48e7009e356e5d72c16832a2c0ce7e377d36e10
parentae5fc40a63a19f7e5d72da5caf7579548911f791
parent85571c339de9aea49c367b2c0a7a8b8b8649c3b3
Merging r49261 through r49263 from trunk into soc-2011-tomato
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_scene.c