Commit: 4853f75073e4d70a7fe434a41b83c33eb186964f
Author: Bastien Montagne
Date: Thu Jun 16 21:13:15 2016 +0200
Branches: id-remap
https://developer.blender.org/rB4853f75073e4d70a7fe434a41b83c33eb186964f
Merge branch 'master' into id-remap
Conflicts:
source/blender/blenkernel/intern/library_query.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library_query.c
index ea4e8d8,4fe408e..8688b00
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -311,11 -286,8 +319,11 @@@ void BKE_library_foreach_ID_link(ID *id
CALLBACK_INVOKE(scene->camera, IDWALK_NOP);
CALLBACK_INVOKE(scene->world, IDWALK_USER);
CALLBACK_INVOKE(scene->set, IDWALK_NOP);
- CALLBACK_INVOKE(scene->clip, IDWALK_NOP);
+ CALLBACK_INVOKE(scene->clip, IDWALK_USER);
- 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);
+ }
/* 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
