From a0dcd0bf2c6952595c871197757bf9878c0c1914 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Wed, 12 Jan 2022 18:36:37 +0100 Subject: Fix warnings after bab47b60cb69 It's not really clear how this part of the defaults code should be used, I think this is fine now and solves the warnings. --- source/blender/makesdna/intern/dna_defaults.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index cc060e1241c..5bc5de7a20b 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -212,7 +212,6 @@ SDNA_DEFAULT_DECL_STRUCT(MetaBall); SDNA_DEFAULT_DECL_STRUCT(MovieClip); SDNA_DEFAULT_DECL_STRUCT(MovieClipUser); SDNA_DEFAULT_DECL_STRUCT(MovieClipScopes); -SDNA_DEFAULT_DECL_STRUCT(MovieTrackingMarker); /* DNA_object_defaults.h */ SDNA_DEFAULT_DECL_STRUCT(Object); @@ -231,7 +230,6 @@ SDNA_DEFAULT_DECL_STRUCT(ToolSettings); SDNA_DEFAULT_DECL_STRUCT(Simulation); /* DNA_space_defaults.h */ -SDNA_DEFAULT_DECL_STRUCT(MaskSpaceInfo); SDNA_DEFAULT_DECL_STRUCT(SpaceClip); /* DNA_speaker_defaults.h */ @@ -418,14 +416,14 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = { /* DNA_space_defaults.h */ SDNA_DEFAULT_DECL(SpaceClip), SDNA_DEFAULT_DECL_EX(MaskSpaceInfo, SpaceClip.mask_info), - SDNA_DEFAULT_DECL_EX(MovieClipUser, SpaceClip.user), - SDNA_DEFAULT_DECL_EX(MovieClipScopes, SpaceClip.scopes), /* DNA_meta_defaults.h */ SDNA_DEFAULT_DECL(MetaBall), /* DNA_movieclip_defaults.h */ SDNA_DEFAULT_DECL(MovieClip), + SDNA_DEFAULT_DECL(MovieClipUser), + SDNA_DEFAULT_DECL(MovieClipScopes), SDNA_DEFAULT_DECL_EX(MovieTrackingMarker, MovieClipScopes.undist_marker), /* DNA_object_defaults.h */ -- cgit v1.2.3