v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1626 from elect86/master 

typo + remove redundant code
pull/1643/head^2
Kim Kulling 2017-12-17 00:30:20 +01:00 committed by GitHub
parent 2c3b2285ed 05f8af950a
commit d46f8ee625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/FBXBinaryTokenizer.cpp
View File

@ -434,6 +434,14 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, unsigned int le
TokenizeError("file is too short",0); TokenizeError("file is too short",0);
} }
//uint32_t offset = 0x15;
/* const char* cursor = input + 0x15;
const uint32_t flags = ReadWord(input, cursor, input + length);
const uint8_t padding_0 = ReadByte(input, cursor, input + length); // unused
const uint8_t padding_1 = ReadByte(input, cursor, input + length); // unused*/
if (strncmp(input,"Kaydara FBX Binary",18)) { if (strncmp(input,"Kaydara FBX Binary",18)) {
TokenizeError("magic bytes not found",0); TokenizeError("magic bytes not found",0);
} }

2
code/MD5Loader.h
View File

@ -145,7 +145,7 @@ protected:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Load the contents of a specific file into memory and /** Load the contents of a specific file into memory and
* alocates a buffer to keep it. * allocates a buffer to keep it.
* *
* mBuffer is modified to point to this buffer. * mBuffer is modified to point to this buffer.
* @param pFile File stream to be read * @param pFile File stream to be read