blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T76883: Zero users scenes after undo. 

Some tags need to be preserved when we reuse existing ID entirely.
AFAICT, currently this is only the EXTRAUSER one.
This commit is contained in:
Bastien Montagne 2020-05-20 10:39:50 +02:00
parent db6e267bfc
commit 3360db83c4
Notes: blender-bot 2023-02-14 03:13:26 +01:00 
Referenced by issue #76883, Zero users scenes after undo
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenloader/intern/readfile.c
View File

@ -9539,7 +9539,8 @@ static void read_libblock_undo_restore_identical(
BLI_assert((fd->skip_flags & BLO_READ_SKIP_UNDO_OLD_MAIN) == 0);
BLI_assert(id_old != NULL);
id_old->tag = tag;
/* Some tags need to be preserved here. */
id_old->tag = tag | (id_old->tag & LIB_TAG_EXTRAUSER);
id_old->lib = main->curlib;
id_old->us = ID_FAKE_USERS(id_old);
/* Do not reset id->icon_id here, memory allocated for it remains valid. */