From c205a856a71376b91a555b59d3a4c1f39db3de9f Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Mon, 21 May 2018 13:29:08 -0700 Subject: [PATCH] Split canned FBX header in two; only check first part on read --- libraries/fbx/src/FBX.h | 3 ++- libraries/fbx/src/FBXWriter.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h index b3b2b29c74..239908f86c 100644 --- a/libraries/fbx/src/FBX.h +++ b/libraries/fbx/src/FBX.h @@ -30,7 +30,8 @@ // See comment in FBXReader::parseFBX(). static const int FBX_HEADER_BYTES_BEFORE_VERSION = 23; -static const QByteArray FBX_BINARY_PROLOG("Kaydara FBX Binary \0\x1a\0", FBX_HEADER_BYTES_BEFORE_VERSION); +static const QByteArray FBX_BINARY_PROLOG("Kaydara FBX Binary "); +static const QByteArray FBX_BINARY_PROLOG2("\0\x1a\0", 3); static const quint32 FBX_VERSION_2015 = 7400; static const quint32 FBX_VERSION_2016 = 7500; diff --git a/libraries/fbx/src/FBXWriter.cpp b/libraries/fbx/src/FBXWriter.cpp index 8a668e7ce9..4504898e32 100644 --- a/libraries/fbx/src/FBXWriter.cpp +++ b/libraries/fbx/src/FBXWriter.cpp @@ -62,6 +62,7 @@ QByteArray FBXWriter::encodeFBX(const FBXNode& root) { out.setVersion(QDataStream::Qt_4_5); out.writeRawData(FBX_BINARY_PROLOG, FBX_BINARY_PROLOG.size()); + out.writeRawData(FBX_BINARY_PROLOG2, FBX_BINARY_PROLOG2.size()); #ifdef USE_FBX_2016_FORMAT out << FBX_VERSION_2016;