Merging r58194 through r58195 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Jul 2013 11:31:15 +0000 (11:31 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 12 Jul 2013 11:31:15 +0000 (11:31 +0000)
1  2 
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c