archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Fix mistake in previous commit

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-21 12:16:12 +01:00
parent 6e47680077
commit 41b29c69c0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
View File

@@ -106,7 +106,6 @@ void deg_graph_detect_cycles(Depsgraph *graph)
else {
set_node_visited_state(node, NODE_NOT_VISITED);
}
node->done = 0;
}
while (!BLI_stack_is_empty(traversal_stack)) {
@@ -118,8 +117,8 @@ void deg_graph_detect_cycles(Depsgraph *graph)
DepsRelation *rel = node->outlinks[i];
if (rel->to->type == DEG_NODE_TYPE_OPERATION) {
OperationDepsNode *to = (OperationDepsNode *)rel->to;
eCyclicCheckVisitedState state = get_node_visited_state(node);
if (state == NODE_IN_STACK) {
eCyclicCheckVisitedState to_state = get_node_visited_state(to);
if (to_state == NODE_IN_STACK) {
printf("Dependency cycle detected:\n");
printf(" '%s' depends on '%s' through '%s'\n",
to->full_identifier().c_str(),
@@ -138,7 +137,7 @@ void deg_graph_detect_cycles(Depsgraph *graph)
/* TODO(sergey): So called russian roulette cycle solver. */
rel->flag |= DEPSREL_FLAG_CYCLIC;
}
else if (state == NODE_NOT_VISITED) {
else if (to_state == NODE_NOT_VISITED) {
StackEntry new_entry;
new_entry.node = to;
new_entry.from = entry;