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
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-03-01 12:59:07 +0300
committerBastien Montagne <bastien@blender.org>2021-03-01 12:59:07 +0300
commitca63729a5b0e03aeee625aa51d7f3f2b22dc6282 (patch)
tree74564485907dc33d87f0ee294ac713514e5c2620 /source
parent71ed6f32d2e3964f27204e3b9c6823fa61d7f8e4 (diff)
Fix T86087: Assert when changing compositor node value or invoking tooltip.
Regression from rBde25b79ff5c4, this flag is inconsistent currently for embedded IDs, needs to be sorted out, see T86119.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/node.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 7bd7fb4a29b..4d52a14b742 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -372,7 +372,8 @@ static ID *node_owner_get(Main *bmain, ID *id)
if ((id->flag & LIB_EMBEDDED_DATA) == 0) {
return id;
}
- BLI_assert((id->tag & LIB_TAG_NO_MAIN) == 0);
+ /* TODO: Sort this NO_MAIN or not for embedded node trees. See T86119. */
+ // BLI_assert((id->tag & LIB_TAG_NO_MAIN) == 0);
ListBase *lists[] = {&bmain->materials,
&bmain->lights,