Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-11-24 12:32:28 +0300
committerBastien Montagne <bastien@blender.org>2021-11-24 12:35:47 +0300
commite0763760e4307cf5fdd16a9d860573709b2d9a18 (patch)
treea10dd33d6273441932a58ce0dfe3023195f16fe0 /source/blender/blenkernel/intern/mesh.cc
parentf8dea3fe648b9f834b6977476549911b71a899aa (diff)
Cleanup: `IDTypeInfo` new `asset_type_info` member.
Two issues addressed here: I) `asset_type_info` is sub-data, not a callback. Therefore, move it before the callbacks in the `IDTypeInfo` struct. II) More important, initialize this new attribute in *ALL* `IDTypeInfo` instances. No member of this struct should ever be left implicitely uninitilazed, ever. Aftermath of rBa84f1c02d251.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.cc')
-rw-r--r--source/blender/blenkernel/intern/mesh.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index bf120b4c1a7..56e5435c68c 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -363,6 +363,7 @@ IDTypeInfo IDType_ID_ME = {
/* name_plural */ "meshes",
/* translation_context */ BLT_I18NCONTEXT_ID_MESH,
/* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE,
+ /* asset_type_info */ nullptr,
/* init_data */ mesh_init_data,
/* copy_data */ mesh_copy_data,
@@ -376,9 +377,10 @@ IDTypeInfo IDType_ID_ME = {
/* blend_read_data */ mesh_blend_read_data,
/* blend_read_lib */ mesh_blend_read_lib,
/* blend_read_expand */ mesh_read_expand,
+
/* blend_read_undo_preserve */ nullptr,
+
/* lib_override_apply_post */ nullptr,
- /* asset_type_info */ nullptr,
};
enum {