Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T56530, T56523: collection visiblity toggling wrong after recent changes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-08-28 12:43:13 +02:00
parent 0023060893
commit e20ed59037
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/depsgraph/intern/depsgraph_query_iter.cc
View File

@@ -163,6 +163,10 @@ void deg_iterator_objects_step(BLI_Iterator *iter, DEG::IDDepsNode *id_node)
/* Set it early in case we need to exit and we are running from within a loop. */
iter->skip = true;
if (!id_node->is_visible) {
return;
}
DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
const ID_Type id_type = GS(id_node->id_orig->name);
@@ -298,7 +302,11 @@ static void DEG_iterator_ids_step(BLI_Iterator *iter, DEG::IDDepsNode *id_node,
{
ID *id_cow = id_node->id_cow;
if (only_updated && !(id_cow->recalc & ID_RECALC_ALL)) {
if (!id_node->is_visible) {
iter->skip = true;
return;
}
else if (only_updated && !(id_cow->recalc & ID_RECALC_ALL)) {
bNodeTree *ntree = ntreeFromID(id_cow);
/* Nodetree is considered part of the datablock. */