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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-08-29 18:12:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-08-29 18:12:43 +0300
commitd34dac10706506efb3d7d43553a2d0278eb0ae3d (patch)
treefc95085506c577a4a1bad74cc1475286636eefe9 /source/blender/depsgraph/intern
parent9deccce07d0d60ab940f980cc81802152c882615 (diff)
Depsgraph: Fix crash when ungrouping node group
We shouldn't tag both COW and shading parameters ocmponents for update at the same time.
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 0f28be1aaf4..5e7ed249365 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -281,6 +281,9 @@ void IDDepsNode::tag_update(Depsgraph *graph)
do_component_tag = false;
}
}
+ else if (comp_node->type == DEG_NODE_TYPE_SHADING_PARAMETERS) {
+ do_component_tag = false;
+ }
else if (comp_node->type == DEG_NODE_TYPE_EVAL_PARTICLES) {
/* Only do explicit particle settings tagging. */
do_component_tag = false;