Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-01-15 01:16:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-01-15 01:18:50 +0300
commitfc8730d4c24027152c1a5c5bd1f2bbac7825578d (patch)
treeb5617348865689ea741a21eae734230a74d3e791 /source/blender/makesdna/intern/makesdna.c
parent5d45c2bf653c78928fb33548273219ef5caa5287 (diff)
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.
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r--source/blender/makesdna/intern/makesdna.c6
1 files changed, 6 insertions, 0 deletions
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 */