[Bf-blender-cvs] [085a1e24673] uuid-undo-experiments-swap-reread-datablocks: Some more debug prints.

Bastien Montagne noreply at git.blender.org
Mon Mar 2 17:52:46 CET 2020


Commit: 085a1e246732b0d5c063491515891dc11e976dff
Author: Bastien Montagne
Date:   Mon Mar 2 17:52:18 2020 +0100
Branches: uuid-undo-experiments-swap-reread-datablocks
https://developer.blender.org/rB085a1e246732b0d5c063491515891dc11e976dff

Some more debug prints.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0decf6f8411..a80da2a8db9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9105,6 +9105,9 @@ static BHead *read_libblock(FileData *fd,
 
         /* Find the 'current' existing ID we want to reuse instead of the one we would read from
          * the undo memfile. */
+        DEBUG_PRINTF("\t Looking for ID %s with uuid %d instead of newly read one\n",
+                     id->name,
+                     id->session_uuid);
         id_old = do_partial_undo ? BKE_main_idmap_lookup_uuid(fd->old_idmap, id->session_uuid) :
                                    NULL;
         bool can_finalize_and_return = false;
@@ -9165,6 +9168,9 @@ static BHead *read_libblock(FileData *fd,
        * addresses for those as well. */
       if (fd->memfile != NULL && do_partial_undo && id->lib == NULL) {
         BLI_assert(fd->old_idmap != NULL);
+        DEBUG_PRINTF("\t Looking for ID %s with uuid %d instead of newly read one\n",
+                     id->name,
+                     id->session_uuid);
         id_old = BKE_main_idmap_lookup_uuid(fd->old_idmap, id->session_uuid);
         if (id_old != NULL) {
           BLI_assert(MEM_allocN_len(id) == MEM_allocN_len(id_old));



More information about the Bf-blender-cvs mailing list