blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

DNA: remove endian switching long checks 

This wasn't correct, and long was only ever used in cases we can now ignore.
This commit is contained in:
Campbell Barton 2016-01-10 07:45:10 +11:00
parent f06f6eab0d
commit ec20c4b558
Notes: blender-bot 2023-02-14 08:20:42 +01:00 
Referenced by issue #47039, [File Reading] Endian / Byte order conversion for address in block header missing
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesdna/DNA_genfile.h
View File

@ -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;

5
source/blender/makesdna/intern/dna_genfile.c
View File

@ -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;