From f0b991c944e8a4af383619f620eb2115595abb04 Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Wed, 12 Jun 2013 07:02:52 +0000 Subject: 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. --- source/blender/blenkernel/intern/lamp.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source/blender/blenkernel/intern/lamp.c') diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 1f381a1a2c2..903b032e080 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -172,9 +172,6 @@ void BKE_lamp_make_local(Lamp *la) if (la->id.lib == NULL) return; if (la->id.us == 1) { id_clear_lib_data(bmain, &la->id); - /* nodetree uses same lib */ - if (la->nodetree) - la->nodetree->id.lib = NULL; return; } @@ -189,9 +186,6 @@ void BKE_lamp_make_local(Lamp *la) if (is_local && is_lib == FALSE) { id_clear_lib_data(bmain, &la->id); - /* nodetree uses same lib */ - if (la->nodetree) - la->nodetree->id.lib = NULL; } else if (is_local && is_lib) { Lamp *la_new = BKE_lamp_copy(la); -- cgit v1.2.3