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

Fix merge conflicts in ACLoader.

pull/5421/head
Kim Kulling 2024-01-18 16:01:47 +01:00
parent d4b00e9ed9
commit 0d2d17e044
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/AC/ACLoader.cpp
View File

@ -170,9 +170,9 @@ bool AC3DImporter::GetNextLine() {
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Parse an object section in an AC file // Parse an object section in an AC file
void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) { bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
if (!TokenMatch(mBuffer.data, "OBJECT", 6)) if (!TokenMatch(mBuffer.data, "OBJECT", 6))
return; return false;
SkipSpaces(&mBuffer.data, mBuffer.end); SkipSpaces(&mBuffer.data, mBuffer.end);
@ -219,7 +219,7 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
} }
} }
} }
return; return true;
} else if (TokenMatch(mBuffer.data, "name", 4)) { } else if (TokenMatch(mBuffer.data, "name", 4)) {
SkipSpaces(&mBuffer.data, mBuffer.data); SkipSpaces(&mBuffer.data, mBuffer.data);
mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, obj.name); mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, obj.name);