diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-20 20:17:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-20 20:39:56 +0300 |
| commit | eb94a0db4f50cdf751144ec19cbab05b6110b338 (patch) | |
| tree | 57066de4cc2d520d71e95590ccffbfd205833870 /source/blender/blenkernel/intern/node.c | |
| parent | b6d1946c2e6b31ac670bb3fef986dccefd5f6a8f (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |