archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Philipp Oeser
2020-05-26 14:24:50 +02:00
parent 23520cbd13 2a692e05c8
commit e790f1a8dc
22 changed files with 237 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9719,7 +9719,7 @@ static bool read_libblock_undo_restore(
}
/* Restore local datablocks. */
DEBUG_PRINTF("UNDO: read %s (uuid %d) -> ", id->name, id->session_uuid);
DEBUG_PRINTF("UNDO: read %s (uuid %u) -> ", id->name, id->session_uuid);
ID *id_old = NULL;
const bool do_partial_undo = (fd->skip_flags & BLO_READ_SKIP_UNDO_OLD_MAIN) == 0;