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

[Julian Eisel]

Commit: 91f7d3e91258c482061eb4ab273a3ef156fb3460
Author: Julian Eisel
Date:   Wed Oct 7 19:16:38 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rB91f7d3e91258c482061eb4ab273a3ef156fb3460

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index d0b4efa207f,cf2181c8a27..9a2a71c0d21
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -1128,7 -1118,7 +1128,8 @@@ static bool read_file_dna(FileData *fd
              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[]");
+         BLI_assert(fd->id_name_offs != -1);
 +        fd->id_asset_data_offs = DNA_elem_offset(fd->filesdna, "ID", "AssetData", "*asset_data");
  
          return true;
        }
diff --cc source/blender/makesdna/intern/dna_defaults.c
index 85f634fd532,273f52a1d74..2157f951356
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@@ -82,7 -82,7 +82,8 @@@
  
  #include "DNA_defaults.h"
  
+ #include "DNA_armature_types.h"
 +#include "DNA_asset_types.h"
  #include "DNA_brush_types.h"
  #include "DNA_cachefile_types.h"
  #include "DNA_camera_types.h"