diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
| commit | 3af98b4c04b33791254a4abe0a03ed65007d5e9a (patch) | |
| tree | c07a9c722b94b1cdc0648c98cefff4ea61cf6c39 /source/blender/makesdna | |
| parent | 1bfe359802a105f5075e9e17c29cd832add619fd (diff) | |
| parent | 6c3d8fbeb399c394831137b511c02df642fade92 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 96085a79eff..181d01e04fc 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -169,7 +169,7 @@ void DNA_sdna_free(SDNA *sdna) } MEM_freeN((void *)sdna->names); - MEM_freeN(sdna->types); + MEM_freeN((void *)sdna->types); MEM_freeN(sdna->structs); #ifdef WITH_DNA_GHASH |