Merge pull request #2326 from MalcolmTyrrell/topic/Bug2034_typeCodeC
Fix for FBX binary tokenization of arrays of type 'c'pull/2348/head
commit
fadfaf88db
|
@ -83,7 +83,7 @@ namespace FBX {
|
||||||
// e_unknown_21 = 1 << 21,
|
// e_unknown_21 = 1 << 21,
|
||||||
// e_unknown_22 = 1 << 22,
|
// e_unknown_22 = 1 << 22,
|
||||||
// e_unknown_23 = 1 << 23,
|
// e_unknown_23 = 1 << 23,
|
||||||
// e_flag_field_size_64_bit = 1 << 24, // Not sure what is
|
// e_flag_field_size_64_bit = 1 << 24, // Not sure what is
|
||||||
// e_unknown_25 = 1 << 25,
|
// e_unknown_25 = 1 << 25,
|
||||||
// e_unknown_26 = 1 << 26,
|
// e_unknown_26 = 1 << 26,
|
||||||
// e_unknown_27 = 1 << 27,
|
// e_unknown_27 = 1 << 27,
|
||||||
|
@ -276,8 +276,8 @@ void ReadData(const char*& sbegin_out, const char*& send_out, const char* input,
|
||||||
case 'f':
|
case 'f':
|
||||||
case 'd':
|
case 'd':
|
||||||
case 'l':
|
case 'l':
|
||||||
case 'i': {
|
case 'i':
|
||||||
|
case 'c': {
|
||||||
const uint32_t length = ReadWord(input, cursor, end);
|
const uint32_t length = ReadWord(input, cursor, end);
|
||||||
const uint32_t encoding = ReadWord(input, cursor, end);
|
const uint32_t encoding = ReadWord(input, cursor, end);
|
||||||
|
|
||||||
|
@ -298,6 +298,10 @@ void ReadData(const char*& sbegin_out, const char*& send_out, const char* input,
|
||||||
stride = 8;
|
stride = 8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'c':
|
||||||
|
stride = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
ai_assert(false);
|
ai_assert(false);
|
||||||
};
|
};
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue