diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-03-09 18:05:06 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-03-09 18:05:33 +0300 |
| commit | dcb93126876879d969a30a7865700abd072066f8 (patch) | |
| tree | 19c4132612f4aa0ab34adc88ccec9c48bd4f2418 /source/blender/depsgraph/intern/depsgraph_build.cc | |
| parent | 93f636957346f33e7a69b0b4caf0ac48a0a9bf42 (diff) | |
Depsgraph: fix crash caused by removing too many NO-OP nodes
Unused no-op operation nodes are not bound to a callback function, and
have no outgoing relations. Incoming relations of such nodes are removed
since ff60dd8b18ed00902e5bdfd36882072db7af8735. However, this was done
too broadly, causing too many relations to be lost and indirectly linked
objects to be unevaluated.
This commit introduces a `DEPSOP_FLAG_FAKE_USER` flag for operation
nodes, which indicates they are not to be removed, even when they appear
to be unused.
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D7074
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_build.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index 75031a2140e..3fe585ff73c 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -50,7 +50,6 @@ extern "C" { #include "builder/deg_builder_cycle.h" #include "builder/deg_builder_nodes.h" #include "builder/deg_builder_relations.h" -#include "builder/deg_builder_remove_noop.h" #include "builder/deg_builder_transitive.h" #include "intern/debug/deg_debug.h" @@ -211,7 +210,6 @@ static void graph_build_finalize_common(DEG::Depsgraph *deg_graph, Main *bmain) if (G.debug_value == 799) { DEG::deg_graph_transitive_reduction(deg_graph); } - DEG::deg_graph_remove_unused_noops(deg_graph); /* Store pointers to commonly used valuated datablocks. */ deg_graph->scene_cow = (Scene *)deg_graph->get_cow_id(°_graph->scene->id); /* Flush visibility layer and re-schedule nodes for update. */ |