Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 11:48:48 +0000 (12:48 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 11:48:48 +0000 (12:48 +0100)
commit79f94674fb2f7fbc08927cc50809b63db4174d17
treea10557c1576f11ad00f5bcb167ecc7e7a0f51937
parent1d5ba269c1f6b232f1ec83e77e6e8fe07d5c5d1f
parentaf1d9ecd40134a2c9af9c1c396e9f67b2ccae455
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_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blenderplayer/bad_level_call_stubs/stubs.c