[Bf-blender-cvs] [c23e8edc546] asset-metadata: Merge branch 'master' into asset-metadata

[Julian Eisel]

Commit: c23e8edc546723690bdc0b45f491fce62a6ab81f
Author: Julian Eisel
Date:   Tue Sep 29 12:54:49 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rBc23e8edc546723690bdc0b45f491fce62a6ab81f

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index c1cc8c7900e,bd944ac32ac..d0b4efa207f
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -1124,9 -1114,10 +1124,11 @@@ static bool read_file_dna(FileData *fd
        if (fd->filesdna) {
          blo_do_versions_dna(fd->filesdna, fd->fileversion, subversion);
          fd->compflags = DNA_struct_get_compareflags(fd->filesdna, fd->memsdna);
+         fd->reconstruct_info = DNA_reconstruct_info_create(
+             fd->filesdna, fd->memsdna, fd->compflags);
          /* used to retrieve ID names from (bhead+1) */
          fd->id_name_offs = DNA_elem_offset(fd->filesdna, "ID", "char", "name[]");
 +        fd->id_asset_data_offs = DNA_elem_offset(fd->filesdna, "ID", "AssetData", "*asset_data");
  
          return true;
        }