[Bf-blender-cvs] [d0c326cd55d] undo-experiments-idnames: Merge branch 'undo-experiments' into undo-experiments-idnames

[Bastien Montagne]

Commit: d0c326cd55d9bf8031d63bf0806579bdb9acffb0
Author: Bastien Montagne
Date:   Thu Jan 9 16:58:35 2020 +0100
Branches: undo-experiments-idnames
https://developer.blender.org/rBd0c326cd55d9bf8031d63bf0806579bdb9acffb0

Merge branch 'undo-experiments' into undo-experiments-idnames

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 1a098d1428e,50ff35c862e..5614863be49
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9465,16 -9435,8 +9458,12 @@@ static BHead *read_libblock(FileData *f
         * and eval, not actual file reading. */
        bhead = read_data_into_oldnewmap(fd, id_bhead, allocname);
  
-       DEBUG_PRINTF("\tfor data of ID %s: are_memchunks_identical: %d\n",
-                    id->name,
-                    fd->are_memchunks_identical);
- 
 -      if (fd->are_memchunks_identical && !ELEM(idcode, ID_WM, ID_SCR, ID_WS)) {
 -        BLI_assert(fd->memfile);
 +      if (fd->memfile != NULL && (fd->skip_flags & BLO_READ_SKIP_UNDO_OLD_MAIN) == 0 &&
 +          fd->are_memchunks_identical && !ELEM(idcode, ID_WM, ID_SCR, ID_WS)) {
 +        BLI_assert(fd->memfile != NULL);
 +        BLI_assert(fd->old_idmap != NULL);
 +        /* This code should only ever be reached for local data-blocks. */
 +        BLI_assert(main->curlib == NULL);
  
          /* Find the 'current' existing ID we want to reuse instead of the one we would read from
           * the undo memfile. */