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)
1  2 
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/scene.c