Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 12:16:43 +0000 (14:16 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 12:16:43 +0000 (14:16 +0200)
commit4577bda634039966b2d03f8991a686d4be6f6285
treec1daf0ae7950543b0a2e2084d11a73f0eddf4aee
parentb0b83c0db41278691b8dd5fcdffc97a84ae97223
parent90bc882068465865883da55e5c82fa99e0f8d66b
Merge branch 'master' into blender2.8
12 files changed:
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/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node.h