Merging r58266 through r58279 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 18:48:34 +0000 (18:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 18:48:34 +0000 (18:48 +0000)
commit9dc2fa3e9204645c9b7555b472fdad78c13a0665
treedc9e3851f18b279bbd8bd2355457034068e45987
parentc8d39fb0c224957fe3b48e9d76fa6c1bfe433965
parent1dd7156c4c1d6a62f17fb6621ec3dc31297ba54a
Merging r58266 through r58279 from trunk into soc-2013-depsgraph_mt
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/scene.c