Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-03-09 18:05:06 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-03-09 18:05:33 +0300
commitdcb93126876879d969a30a7865700abd072066f8 (patch)
tree19c4132612f4aa0ab34adc88ccec9c48bd4f2418 /source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
parent93f636957346f33e7a69b0b4caf0ac48a0a9bf42 (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/builder/deg_builder_remove_noop.cc')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
index 33de20133db..aa0cb66a38f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc
@@ -35,13 +35,24 @@
namespace DEG {
+static inline bool is_unused_noop(OperationNode *op_node)
+{
+ if (op_node == nullptr) {
+ return false;
+ }
+ if (op_node->flag & OperationFlag::DEPSOP_FLAG_PINNED) {
+ return false;
+ }
+ return op_node->is_noop() && op_node->outlinks.empty();
+}
+
void deg_graph_remove_unused_noops(Depsgraph *graph)
{
int num_removed_relations = 0;
deque<OperationNode *> queue;
for (OperationNode *node : graph->operations) {
- if (node->is_noop() && node->outlinks.empty()) {
+ if (is_unused_noop(node)) {
queue.push_back(node);
}
}
@@ -61,7 +72,7 @@ void deg_graph_remove_unused_noops(Depsgraph *graph)
/* Queue parent no-op node that has now become unused. */
OperationNode *operation = dependency->get_exit_operation();
- if (operation != nullptr && operation->is_noop() && operation->outlinks.empty()) {
+ if (is_unused_noop(operation)) {
queue.push_back(operation);
}
}