[Bf-blender-cvs] [259ae1ac31f] undo-experiments: Merge branch 'master' into undo-experiments

[Bastien Montagne]

Commit: 259ae1ac31f6d7538a11c3b44dc1762027d00ac3
Author: Bastien Montagne
Date:   Tue Nov 12 12:13:16 2019 +0100
Branches: undo-experiments
https://developer.blender.org/rB259ae1ac31f6d7538a11c3b44dc1762027d00ac3

Merge branch 'master' into undo-experiments

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 9d019812a04,167917f7b6a..0919c7ad6da
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9286,13 -9257,28 +9343,22 @@@ static BHead *read_libblock(FileData *f
    }
  
    /* this case cannot be direct_linked: it's just the ID part */
 -  if (bhead->code == ID_LINK_PLACEHOLDER) {
 +  if (id_bhead->code == ID_LINK_PLACEHOLDER) {
      /* That way, we know which data-lock needs do_versions (required currently for linking). */
-     id->tag = tag | LIB_TAG_NEED_LINK | LIB_TAG_NEW;
+     id->tag = tag | LIB_TAG_ID_LINK_PLACEHOLDER | LIB_TAG_NEED_LINK | LIB_TAG_NEW;
+ 
+     if (placeholder_set_indirect_extern) {
+       if (id->flag & LIB_INDIRECT_WEAK_LINK) {
+         id->tag |= LIB_TAG_INDIRECT;
+       }
+       else {
+         id->tag |= LIB_TAG_EXTERN;
+       }
+     }
  
 -    return blo_bhead_next(fd, bhead);
 +    return blo_bhead_next(fd, id_bhead);
    }
  
 -  /* need a name for the mallocN, just for debugging and sane prints on leaks */
 -  allocname = dataname(GS(id->name));
 -
 -  /* read all data into fd->datamap */
 -  bhead = read_data_into_oldnewmap(fd, bhead, allocname);
 -
    /* init pointers direct data */
    direct_link_id(fd, id);