diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-02-15 21:33:16 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-02-15 21:33:16 +0300 |
| commit | 45852532d55be4fc7ab4f0f3be00983a78c69dea (patch) | |
| tree | 9912df4a12b824e816ababd26ed893fa45017821 /source/blender/editors/space_node/space_node.c | |
| parent | cab8a76abf73e61034eed685dd0c77178025f401 (diff) | |
| parent | 9cccbbebaa3f03aa5137bd54f991f2cd824a3977 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_node/space_node.c')
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 73c6a28a5dc..74aff6a290b 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -79,7 +79,12 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from) BLI_addtail(&snode->treepath, path); - id_us_ensure_real(&ntree->id); + if (ntree->type != NTREE_GEOMETRY) { + /* This can probably be removed for all node tree types. It mainly exists because it was not + * possible to store id references in custom properties. Also see T36024. I don't want to + * remove it for all tree types in bcon3 though. */ + id_us_ensure_real(&ntree->id); + } } /* update current tree */ |