[Bf-blender-cvs] [ec20c4b] master: DNA: remove endian switching long checks

[Campbell Barton]

Commit: ec20c4b558cc569e8a9d44923a2303fbc7d13523
Author: Campbell Barton
Date:   Sun Jan 10 07:45:10 2016 +1100
Branches: master
https://developer.blender.org/rBec20c4b558cc569e8a9d44923a2303fbc7d13523

DNA: remove endian switching long checks

This wasn't correct, and long was only ever used in cases we can now ignore.

===================================================================

M	source/blender/makesdna/DNA_genfile.h
M	source/blender/makesdna/intern/dna_genfile.c

===================================================================

diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h
index 9a6c714..0af26fb 100644
--- a/source/blender/makesdna/DNA_genfile.h
+++ b/source/blender/makesdna/DNA_genfile.h
@@ -48,11 +48,11 @@ typedef enum eSDNA_Type {
 	SDNA_TYPE_SHORT    = 2,
 	SDNA_TYPE_USHORT   = 3,
 	SDNA_TYPE_INT      = 4,
-	SDNA_TYPE_LONG     = 5,
-	SDNA_TYPE_ULONG    = 6,
+	SDNA_TYPE_LONG     = 5,  /* deprecated (use as int) */
+	SDNA_TYPE_ULONG    = 6,  /* deprecated (use as int) */
 	SDNA_TYPE_FLOAT    = 7,
 	SDNA_TYPE_DOUBLE   = 8,
-	/* ,SDNA_TYPE_VOID = 9 */ /* nothing uses yet */
+	/* ,SDNA_TYPE_VOID = 9 */
 	SDNA_TYPE_INT64    = 10,
 	SDNA_TYPE_UINT64   = 11
 } eSDNA_Type;
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index cea6165..f50e38d 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -1205,7 +1205,10 @@ void DNA_struct_switch_endian(SDNA *oldsdna, int oldSDNAnr, char *data)
 						}
 					}
 				}
-				else if (ELEM(spc[0], SDNA_TYPE_INT, SDNA_TYPE_FLOAT, SDNA_TYPE_LONG, SDNA_TYPE_ULONG)) {
+				else if (ELEM(spc[0], SDNA_TYPE_INT, SDNA_TYPE_FLOAT)) {
+					/* note, intentionally ignore long/ulong here these could be 4 or 8 bits,
+					 * but turns out we only used for runtime vars and
+					 * only once for a struct type thats no longer used. */
 
 					mul = DNA_elem_array_size(name);
 					cpo = cur;