Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 15:32:50 +0000 (16:32 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 15:32:50 +0000 (16:32 +0100)
commit0439733cf8963dec13654c5b55556d8b11639d9c
tree097b6a45db1e1a8ff5a3ce2b0a295b78d8207e19
parentaa2ecbf35b26edd22deb1595487ef59035d1a16c
parent1136dee23273830ce16a624526b45d145a7e4020
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_update.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc