diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:45:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:45:16 +0400 |
| commit | 19d0f93099b0964fca66c4f4b1651260b749a73d (patch) | |
| tree | dbc9dabdc2e87dba0d35d0a947b70abb5f07af08 /source/blender/makesdna | |
| parent | 873fe5cb59deac0918135e2226c6d2b3cbc743ef (diff) | |
| parent | 054e10ac135eee0eb6d4a0e3ca5a3e8ae5a94cea (diff) | |
svn merge ^/trunk/blender -r43934:43976
Diffstat (limited to 'source/blender/makesdna')
| -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); |