diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-06-12 11:02:52 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-06-12 11:02:52 +0400 |
commit | f0b991c944e8a4af383619f620eb2115595abb04 (patch) | |
tree | ddbd57ec05ede020b629639fa40cae8c86dc6e77 /source/blender/blenkernel/intern/material.c | |
parent | d00ca6eb2c4f9598bfbf9419f36937a16f81fc62 (diff) |
Supplementary fix for #35640, internal node group trees (inside material, lamp, world, texture and scene) still keep their original library pointer when appending, making them uneditable. Clearing the
lib pointer now has been moved inside the id_clear_lib_data function, with an ugly switch statement to handle integrated node trees.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 87fb64c0761..c8cd65e9477 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -308,9 +308,6 @@ void BKE_material_make_local(Material *ma) if (ma->id.us == 1) { id_clear_lib_data(bmain, &ma->id); extern_local_material(ma); - /* nodetree uses same lib */ - if (ma->nodetree) - ma->nodetree->id.lib = NULL; return; } @@ -373,9 +370,6 @@ void BKE_material_make_local(Material *ma) if (is_local && is_lib == FALSE) { id_clear_lib_data(bmain, &ma->id); extern_local_material(ma); - /* nodetree uses same lib */ - if (ma->nodetree) - ma->nodetree->id.lib = NULL; } /* Both user and local, so copy. */ else if (is_local && is_lib) { |