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/texture.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/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index be48c7cf12a..1d0b0deae7e 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -765,9 +765,6 @@ void BKE_texture_make_local(Tex *tex) if (tex->id.us == 1) { id_clear_lib_data(bmain, &tex->id); extern_local_texture(tex); - /* nodetree uses same lib */ - if (tex->nodetree) - tex->nodetree->id.lib = NULL; return; } @@ -827,9 +824,6 @@ void BKE_texture_make_local(Tex *tex) if (is_local && is_lib == FALSE) { id_clear_lib_data(bmain, &tex->id); extern_local_texture(tex); - /* nodetree uses same lib */ - if (tex->nodetree) - tex->nodetree->id.lib = NULL; } else if (is_local && is_lib) { Tex *tex_new = BKE_texture_copy(tex); |