Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Jun 2017 12:09:53 +0000 (14:09 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Jun 2017 12:09:53 +0000 (14:09 +0200)
commit3b6facb3d299125531e15480e5efc9031398edc2
tree72cc717fb8f9a3840ae98f03624a700803113360
parent00b009ca7453c1b4571af16daa37987e4391fe3e
parenta3bb3092759f01a5914ffef4fa0e9afe1e02f2fa
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object_update.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/depsgraph_types.h