diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/makesdna/intern/dna_defaults.c | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/makesdna/intern/dna_defaults.c')
-rw-r--r-- | source/blender/makesdna/intern/dna_defaults.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c index 2dbbb35c3ca..1d4257328a4 100644 --- a/source/blender/makesdna/intern/dna_defaults.c +++ b/source/blender/makesdna/intern/dna_defaults.c @@ -324,6 +324,7 @@ SDNA_DEFAULT_DECL_STRUCT(LineartGpencilModifierData); SDNA_DEFAULT_DECL_STRUCT(LengthGpencilModifierData); SDNA_DEFAULT_DECL_STRUCT(DashGpencilModifierData); SDNA_DEFAULT_DECL_STRUCT(DashGpencilModifierSegment); +SDNA_DEFAULT_DECL_STRUCT(ShrinkwrapGpencilModifierData); #undef SDNA_DEFAULT_DECL_STRUCT @@ -555,13 +556,16 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = { SDNA_DEFAULT_DECL(LengthGpencilModifierData), SDNA_DEFAULT_DECL(DashGpencilModifierData), SDNA_DEFAULT_DECL(DashGpencilModifierSegment), + SDNA_DEFAULT_DECL(ShrinkwrapGpencilModifierData), }; #undef SDNA_DEFAULT_DECL #undef SDNA_DEFAULT_DECL_EX -char *_DNA_struct_default_alloc_impl(const char *data_src, size_t size, const char *alloc_str) +uint8_t *_DNA_struct_default_alloc_impl(const uint8_t *data_src, + size_t size, + const char *alloc_str) { - char *data_dst = MEM_mallocN(size, alloc_str); + uint8_t *data_dst = MEM_mallocN(size, alloc_str); memcpy(data_dst, data_src, size); return data_dst; } |