Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 6 Jun 2017 10:17:07 +0000 (12:17 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 6 Jun 2017 10:17:07 +0000 (12:17 +0200)
commit47fd882e79f337a90a66f8b9a21bfe92c7e5f25e
tree0b4e369327f9f24337acf857eb014abd304d3c1d
parenta418e269c8c5660190da9423aaf3d5e792442750
parent58a434b37256766a73ecda79f7620632f2183fb8
Merge branch 'master' into blender2.8
16 files changed:
source/blender/depsgraph/intern/builder/deg_builder.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/depsgraph/intern/depsgraph_query.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node_component.cc