Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Nov 2017 11:04:57 +0000 (12:04 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Nov 2017 11:04:57 +0000 (12:04 +0100)
commit545f671b80f2ad39c8fdee07db3b03119c274187
tree601793f1c8c7221512b22e822fb3cde0df6a3241
parent7ba1babc902b9baf460b26ac24a19497231b64b5
parentf2842ac65ea28e38af45ca8202a1b0d3fcd6c172
Merge branch 'master' into blender2.8
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