[Bf-blender-cvs] [eb94a0db4f5] master: Fix assert after recent changes.
Brecht Van Lommel
noreply at git.blender.org
Wed Mar 20 18:41:48 CET 2019
Commit: eb94a0db4f50cdf751144ec19cbab05b6110b338
Author: Brecht Van Lommel
Date: Wed Mar 20 18:17:24 2019 +0100
Branches: master
https://developer.blender.org/rBeb94a0db4f50cdf751144ec19cbab05b6110b338
Fix assert after recent changes.
Mark as localized immediately, so that functions that edit the node tree can
verify they are being used under the correct conditions.
===================================================================
M source/blender/blenkernel/intern/node.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index d4dd74a0e2d..aabd32d9cb6 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2045,6 +2045,8 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree)
(LIB_ID_COPY_LOCALIZE |
LIB_ID_COPY_NO_ANIMDATA));
+ ltree->id.tag |= LIB_TAG_LOCALIZED;
+
for (node = ltree->nodes.first; node; node = node->next) {
if ((ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) && node->id) {
node->id = (ID *)ntreeLocalize((bNodeTree *)node->id);
@@ -2062,8 +2064,6 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree)
if (ntree->typeinfo->localize)
ntree->typeinfo->localize(ltree, ntree);
- ltree->id.tag |= LIB_TAG_LOCALIZED;
-
BLI_mutex_unlock(ntree->duplilock);
return ltree;
More information about the Bf-blender-cvs
mailing list