Commit: 1da2edfb257e792c58044e295ffae2eee3851505
Author: Bastien Montagne
Date: Mon Nov 30 15:38:42 2015 +0100
Branches: id-remap
https://developer.blender.org/rB1da2edfb257e792c58044e295ffae2eee3851505
Merge branch 'master' into id-remap
Conflicts:
source/blender/blenkernel/intern/library_query.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library_query.c
index 627b0fc,d54f382..bfc6800
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -249,14 -223,9 +249,12 @@@ void BKE_library_foreach_ID_link(ID *id
CALLBACK_INVOKE(scene->world, IDWALK_USER);
CALLBACK_INVOKE(scene->set, IDWALK_NOP);
CALLBACK_INVOKE(scene->clip, IDWALK_NOP);
- CALLBACK_INVOKE(scene->nodetree, IDWALK_NOP);
+ if (scene->nodetree) {
+ /* nodetree **are owned by IDs**, treat them as
mere sub-data and not real ID! */
+ BKE_library_foreach_ID_link((ID
*)scene->nodetree, callback, user_data, flag);
+ }
- if (scene->basact) {
- /* Eeeek... baseact is also in scene->base
list, any good reason to call this twice? */
- CALLBACK_INVOKE(scene->basact->object,
IDWALK_USER);
- }
+ /* DO NOT handle scene->basact here, it’s doubling with
the loop over whole scene->base later,
+ * since basact is just a pointer to one of those
items. */
CALLBACK_INVOKE(scene->obedit, IDWALK_NOP);
for (srl = scene->r.layers.first; srl; srl = srl->next)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
