[Bf-blender-cvs] [d7c757bedd3] asset-metadata: Fix crash loading some files after recent merge

[Julian Eisel]

Commit: d7c757bedd312d1fd33111c6bf1322389295a962
Author: Julian Eisel
Date:   Fri Nov 13 00:13:17 2020 +0100
Branches: asset-metadata
https://developer.blender.org/rBd7c757bedd312d1fd33111c6bf1322389295a962

Fix crash loading some files after recent merge

Caused by badly resolved merge conflicts.

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

M	source/blender/makesdna/intern/dna_defaults.c

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

diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 3f9bbffdb82..8897c8a3426 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -117,6 +117,7 @@
 #include "DNA_volume_types.h"
 #include "DNA_world_types.h"
 
+#include "DNA_armature_defaults.h"
 #include "DNA_asset_defaults.h"
 #include "DNA_brush_defaults.h"
 #include "DNA_cachefile_defaults.h"
@@ -152,6 +153,9 @@
 /* DNA_asset_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(AssetData);
 
+/* DNA_armature_defaults.h */
+SDNA_DEFAULT_DECL_STRUCT(bArmature);
+
 /* DNA_brush_defaults.h */
 SDNA_DEFAULT_DECL_STRUCT(Brush);
 
@@ -342,6 +346,9 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     /* DNA_asset_defaults.h */
     SDNA_DEFAULT_DECL(AssetData),
 
+    /* DNA_armature_defaults.h */
+    SDNA_DEFAULT_DECL(bArmature),
+
     /* DNA_brush_defaults.h */
     SDNA_DEFAULT_DECL(Brush),