griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Make code a bit more robust against tagging indirectly linked objects

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-24 15:10:34 +01:00
parent a365f1dd65
commit 71febcbae0
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/depsgraph/intern/depsgraph_tag.cc
View File

@@ -299,16 +299,27 @@ void id_tag_update_select_update(Depsgraph *graph, IDDepsNode *id_node)
* road.
*/
component = id_node->find_component(DEG_NODE_TYPE_LAYER_COLLECTIONS);
node = component->find_operation(DEG_OPCODE_VIEW_LAYER_DONE);
BLI_assert(component != NULL);
if (component != NULL) {
node = component->find_operation(DEG_OPCODE_VIEW_LAYER_DONE);
}
}
else if (id_type == ID_OB) {
component = id_node->find_component(DEG_NODE_TYPE_LAYER_COLLECTIONS);
node = component->find_operation(DEG_OPCODE_OBJECT_BASE_FLAGS);
/* NOTE: This component might be missing for indirectly linked
* objects.
*/
if (component != NULL) {
node = component->find_operation(DEG_OPCODE_OBJECT_BASE_FLAGS);
}
}
else {
component = id_node->find_component(DEG_NODE_TYPE_BATCH_CACHE);
node = component->find_operation(DEG_OPCODE_GEOMETRY_SELECT_UPDATE,
"", -1);
BLI_assert(component != NULL);
if (component != NULL) {
node = component->find_operation(DEG_OPCODE_GEOMETRY_SELECT_UPDATE,
"", -1);
}
}
if (node != NULL) {
node->tag_update(graph);