From fc8730d4c24027152c1a5c5bd1f2bbac7825578d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 Jan 2016 09:16:24 +1100 Subject: DNA: partial revert of long removal 924c626 broke loading on systems with different endian. We could support reading values from SDNA, it isn't really worth the extra hassle. Long support is still removed, just keep enum values the same. --- source/blender/makesdna/intern/makesdna.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/blender/makesdna/intern/makesdna.c') diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 0bdd428bef9..651794da50d 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -994,6 +994,12 @@ static int make_structDNA(const char *baseDirectory, FILE *file) add_type("short", 2); /* SDNA_TYPE_SHORT */ add_type("ushort", 2); /* SDNA_TYPE_USHORT */ add_type("int", 4); /* SDNA_TYPE_INT */ + + /* note, long isn't supported, + * these are place-holders to maintain alignment with eSDNA_Type*/ + add_type("long", 4); /* SDNA_TYPE_LONG */ + add_type("ulong", 4); /* SDNA_TYPE_ULONG */ + add_type("float", 4); /* SDNA_TYPE_FLOAT */ add_type("double", 8); /* SDNA_TYPE_DOUBLE */ add_type("int64_t", 8); /* SDNA_TYPE_INT64 */ -- cgit v1.2.3