diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:20:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:20:23 +0400 |
| commit | 054e10ac135eee0eb6d4a0e3ca5a3e8ae5a94cea (patch) | |
| tree | 60c772bd265957f532661e100e2f9e2ccf44c93a /source/blender/makesdna/DNA_genfile.h | |
| parent | 1f74789d1250033eed6c5b9c86df5274c1339581 (diff) | |
fix [#30090] Cloth modifier related crash when loading old file
own fault when adding int64 support. `void` type was being used to workaround a different bug in the ClothSimSettings struct.
Diffstat (limited to 'source/blender/makesdna/DNA_genfile.h')
| -rw-r--r-- | source/blender/makesdna/DNA_genfile.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h index 6516b50402d..2264e82b363 100644 --- a/source/blender/makesdna/DNA_genfile.h +++ b/source/blender/makesdna/DNA_genfile.h @@ -48,13 +48,13 @@ typedef enum eSDNA_Type { SDNA_TYPE_ULONG = 6, SDNA_TYPE_FLOAT = 7, SDNA_TYPE_DOUBLE = 8, - SDNA_TYPE_INT64 = 9, - SDNA_TYPE_UINT64 = 10 - /* ,SDNA_TYPE_VOID = 11 */ /* nothing uses yet */ + /* ,SDNA_TYPE_VOID = 9 */ /* nothing uses yet */ + SDNA_TYPE_INT64 = 10, + SDNA_TYPE_UINT64 = 11 } eSDNA_Type; /* define so switch statements don't complain */ -#define SDNA_TYPE_VOID 11 +#define SDNA_TYPE_VOID 9 struct SDNA *DNA_sdna_from_data(void *data, int datalen, int do_endian_swap); void DNA_sdna_free(struct SDNA *sdna); |