[Bf-blender-cvs] [ca63729a5b0] master: Fix T86087: Assert when changing compositor node value or invoking tooltip.
Bastien Montagne
noreply at git.blender.org
Mon Mar 1 11:00:42 CET 2021
Commit: ca63729a5b0e03aeee625aa51d7f3f2b22dc6282
Author: Bastien Montagne
Date: Mon Mar 1 10:59:07 2021 +0100
Branches: master
https://developer.blender.org/rBca63729a5b0e03aeee625aa51d7f3f2b22dc6282
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.
===================================================================
M source/blender/blenkernel/intern/node.cc
===================================================================
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,
More information about the Bf-blender-cvs
mailing list