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)
commite3c645fe469e35c76a66fe9490048a68efa41647
treedfa12ad576062dd3657bb20d1afe3ce1be9daa96
parenteec1f3170869a834c1dba6a5d74e647fd750046a
parentda0ea308665e4ccdddaf3ab97893de13362f1cf5
Merging r58194 through r58195 from trunk into soc-2013-depsgraph_mt
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c