Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenkernel/intern/library_query.c2
-rw-r--r--source/blender/windowmanager/intern/wm_files_link.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index a95069a2af9..085051f633c 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -591,7 +591,7 @@ static void library_foreach_ID_link(Main *bmain,
CALLBACK_INVOKE(object->parent, IDWALK_CB_NEVER_SELF);
CALLBACK_INVOKE(object->track, IDWALK_CB_NEVER_SELF);
/* object->proxy is refcounted, but not object->proxy_group... *sigh* */
- CALLBACK_INVOKE(object->proxy, IDWALK_CB_NEVER_SELF);
+ CALLBACK_INVOKE(object->proxy, IDWALK_CB_USER | IDWALK_CB_NEVER_SELF);
CALLBACK_INVOKE(object->proxy_group, IDWALK_CB_NOP);
/* Special case!
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 0cb3e5e3088..1a46a4550d9 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -729,7 +729,10 @@ static void lib_relocate_do(Main *bmain,
}
if (new_id) {
#ifdef PRINT_DEBUG
- printf("before remap, old_id users: %d, new_id users: %d\n", old_id->us, new_id->us);
+ printf("before remap of %s, old_id users: %d, new_id users: %d\n",
+ old_id->name,
+ old_id->us,
+ new_id->us);
#endif
BKE_libblock_remap_locked(bmain, old_id, new_id, remap_flags);
@@ -739,7 +742,10 @@ static void lib_relocate_do(Main *bmain,
}
#ifdef PRINT_DEBUG
- printf("after remap, old_id users: %d, new_id users: %d\n", old_id->us, new_id->us);
+ printf("after remap of %s, old_id users: %d, new_id users: %d\n",
+ old_id->name,
+ old_id->us,
+ new_id->us);
#endif
/* In some cases, new_id might become direct link, remove parent of library in this case. */