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

Merge pull request #1534 from Matter-and-Form/texturefile-int-name-fix 

[PLY] fix for TextureFile with number in file name
pull/1529/head^2
Kim Kulling 2017-11-03 19:10:01 +01:00 committed by GitHub
parent c666a05e16 2922753589
commit 56674de1d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/PlyParser.cpp
View File

@ -381,6 +381,11 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
{ {
char* endPos = &buffer[0] + (strlen(&buffer[0]) - 1); char* endPos = &buffer[0] + (strlen(&buffer[0]) - 1);
pOut->szName = std::string(&buffer[0], endPos); pOut->szName = std::string(&buffer[0], endPos);
// go to the next line
PLY::DOM::SkipSpacesAndLineEnd(buffer);
return true;
} }
//parse the number of occurrences of this element //parse the number of occurrences of this element
@ -933,7 +938,7 @@ bool PLY::PropertyInstance::ParseValue(const char* &pCur,
{ {
ai_assert(NULL != pCur); ai_assert(NULL != pCur);
ai_assert(NULL != out); ai_assert(NULL != out);
//calc element size //calc element size
bool ret = true; bool ret = true;
switch (eType) switch (eType)