[Bf-blender-cvs] [4d464a946a0] master: Fix (unreported) library relocating code making indirectly linked IDs direct.

[Bastien Montagne]

Commit: 4d464a946a061cdcd6bca3b7d41de01eb3fc33d6
Author: Bastien Montagne
Date:   Fri Apr 29 16:47:10 2022 +0200
Branches: master
https://developer.blender.org/rB4d464a946a061cdcd6bca3b7d41de01eb3fc33d6

Fix (unreported) library relocating code making indirectly linked IDs direct.

While relatively minor issue, it could become fairly annoying in a big
project, since once an ID is tagged as directly linked it tend to remain
as such.

Now also force indirect tagging when loading new IDs as part of a lib
relocation process, since the ones actually directly linked will be
tagged as such later on.

===================================================================

M	source/blender/windowmanager/intern/wm_files_link.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 25b9678ef11..b41ffb4cfc2 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -756,10 +756,10 @@ static int wm_lib_relocate_exec_do(bContext *C, wmOperator *op, bool do_reload)
       }
     }
 
-    if (do_reload) {
-      BKE_blendfile_link_append_context_flag_set(
-          lapp_context, BLO_LIBLINK_USE_PLACEHOLDERS | BLO_LIBLINK_FORCE_INDIRECT, true);
-    }
+    BKE_blendfile_link_append_context_flag_set(lapp_context,
+                                               BLO_LIBLINK_FORCE_INDIRECT |
+                                                   (do_reload ? BLO_LIBLINK_USE_PLACEHOLDERS : 0),
+                                               true);
 
     BKE_blendfile_library_relocate(lapp_context, op->reports, lib, do_reload);