diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-12-20 17:01:04 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-12-20 17:01:04 +0300 |
| commit | 93c275347ead3844789c2203f632c593a438e93b (patch) | |
| tree | 742c1033e1c38278290b750433b2debacfdd21bf /source/blender/makesdna | |
| parent | a7220bffbfa5b3d5726e39397ff382984c5be499 (diff) | |
| parent | 5fb85ef2c2465a4192e60c8c671904c143ecc6c9 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Conflicts:
source/blender/makesrna/intern/rna_render.c
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 59fd0c7832c..9a8f3da3396 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -336,7 +336,8 @@ enum { /* tag datablock has having actually increased usercount for the extra virtual user. */ LIB_TAG_EXTRAUSER_SET = 1 << 7, - /* RESET_AFTER_USE tag newly duplicated/copied IDs. */ + /* RESET_AFTER_USE tag newly duplicated/copied IDs. + * Also used internally in readfile.c to mark datablocks needing do_versions. */ LIB_TAG_NEW = 1 << 8, /* RESET_BEFORE_USE free test flag. * TODO make it a RESET_AFTER_USE too. */ 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 |