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

Merge pull request #1644 from mesilliac/nonascii_chars_in_fbxmaterial_cpp 

Fix non-ascii encoding in comments in FBXMaterial.cpp.
pull/1645/merge
Kim Kulling 2017-12-18 08:58:49 +01:00 committed by GitHub
parent 8761ab0efd 39e36371f9
commit 5ddc281c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/FBXMaterial.cpp
View File

@ -298,7 +298,7 @@ Video::Video(uint64_t id, const Element& element, const Document& doc, const std
}
if(Content) {
//this field is ommited when the embedded texture is already loaded, let's ignore if it´s not found
//this field is ommited when the embedded texture is already loaded, let's ignore if it's not found
try {
const Token& token = GetRequiredToken(*Content, 0);
const char* data = token.begin();
@ -323,7 +323,7 @@ Video::Video(uint64_t id, const Element& element, const Document& doc, const std
::memcpy(content, data + 5, len);
}
} catch (runtime_error runtimeError) {
//we don´t need the content data for contents that has already been loaded
//we don't need the content data for contents that has already been loaded
}
}