diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-12 00:32:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-12 00:34:15 +0300 |
| commit | 3c7369164e0a7edc858b45298bae25c0a20ed0f8 (patch) | |
| tree | 000233f247a25add912fd60d666ed56857816912 /source/blender/blenkernel/intern/node.c | |
| parent | e8d7a0206e994786e2556699d13d54e9517bcbb9 (diff) | |
Fix T47379: crash appending materials with node trees.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ad714b825b4..bc8a7d97a09 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1979,7 +1979,7 @@ static void extern_local_ntree(bNodeTree *ntree) } } -void ntreeMakeLocal(bNodeTree *ntree) +void ntreeMakeLocal(bNodeTree *ntree, bool id_in_mainlist) { Main *bmain = G.main; bool lib = false, local = false; @@ -1991,7 +1991,7 @@ void ntreeMakeLocal(bNodeTree *ntree) if (ntree->id.lib == NULL) return; if (ntree->id.us == 1) { - id_clear_lib_data(bmain, (ID *)ntree); + id_clear_lib_data_ex(bmain, (ID *)ntree, id_in_mainlist); extern_local_ntree(ntree); return; } @@ -2012,7 +2012,7 @@ void ntreeMakeLocal(bNodeTree *ntree) /* if all users are local, we simply make tree local */ if (local && !lib) { - id_clear_lib_data(bmain, (ID *)ntree); + id_clear_lib_data_ex(bmain, (ID *)ntree, id_in_mainlist); extern_local_ntree(ntree); } else if (local && lib) { |