diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-09 00:40:44 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-09 00:40:44 +0400 |
| commit | 1957a29c5af84b65402e9bea25f98ea6bffe3b3b (patch) | |
| tree | bd4d15040f25f4014479219661e57663947a395a /source/blender/makesdna | |
| parent | c5664a86a030617cef63a771a39f7bf19a3ec66c (diff) | |
| parent | 33bca3075f2cc8201b13a6f08b22d7a1288aab4d (diff) | |
Merging r43952 through r43994 from trunk into soc-2011-tomato
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); |