[Bf-blender-cvs] [d80f7c857bf] undo-experiments: Undo spped-up: remove collections from ignored IDs.

Bastien Montagne noreply at git.blender.org
Wed Nov 27 14:46:32 CET 2019


Commit: d80f7c857bf8f771a01a393e2b265dd97ec78f26
Author: Bastien Montagne
Date:   Mon Nov 18 14:17:04 2019 +0100
Branches: undo-experiments
https://developer.blender.org/rBd80f7c857bf8f771a01a393e2b265dd97ec78f26

Undo spped-up: remove collections from ignored IDs.

Looks like this is not crashing anymore (though still very bugy), the
others (UI dtat-blocks) we do not really care anyway...

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index db94b1ee378..b1e8d01ff06 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9267,7 +9267,7 @@ static BHead *read_libblock(FileData *fd,
                    id->name,
                    fd->are_memchunks_identical);
 
-      if (fd->are_memchunks_identical && !ELEM(idcode, ID_GR, ID_WM, ID_SCR, ID_WS)) {
+      if (fd->are_memchunks_identical && !ELEM(idcode, ID_WM, ID_SCR, ID_WS)) {
         BLI_assert(fd->memfile);
         Main *old_main = fd->old_mainlist->first;
         ID *old_id = NULL;



More information about the Bf-blender-cvs mailing list