Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 16:59:04 +0000 (17:59 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Nov 2017 16:59:04 +0000 (17:59 +0100)
commitbaaf81e13edc2b25dee7af67f49e7a731d057513
tree44041b77a79cd95a40685c869c38a47d0d10e37c
parent75eb219a2e21abe9c9909d76f85abbb538d8ef9f
parent5b5939c6e6494583a0c99f6dccb8ca8c617d204b
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc