diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 02:58:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 03:01:17 +0300 |
| commit | 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e (patch) | |
| tree | 91c4fb3bbe944a4f9e0e6d72a25d12310872f849 /source/blender/makesdna | |
| parent | 8400b4b566350bd9d726a07627e74f5a995280da (diff) | |
| parent | e6df02861e17f75d4dd243776f35208681b78465 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 261e0a5410f..48fe82b3e1a 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -87,9 +87,7 @@ typedef struct BevList { int charidx; int *segbevcount; float *seglen; - - /* over-alloc */ - BevPoint bevpoints[0]; + BevPoint *bevpoints; } BevList; /** diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index ac932a8daaf..199bb75d099 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -173,7 +173,9 @@ void DNA_sdna_free(SDNA *sdna) MEM_freeN(sdna->structs); #ifdef WITH_DNA_GHASH - BLI_ghash_free(sdna->structs_map, NULL, NULL); + if (sdna->structs_map) { + BLI_ghash_free(sdna->structs_map, NULL, NULL); + } #endif MEM_freeN(sdna); |