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

Fix parsing <init_from> in <image>. 

The regression was introduced in 21678df.
pull/5305/head^2
Wojciech Matyjewicz 2023-10-23 10:50:52 +02:00 committed by Kim Kulling
parent 2235518b3c
commit 069e19487c
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/Collada/ColladaParser.cpp
View File

@ -814,7 +814,6 @@ void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
if (!pImage.mFileName.length()) { if (!pImage.mFileName.length()) {
pImage.mFileName = "unknown_texture"; pImage.mFileName = "unknown_texture";
} }
}
} else if (mFormat == FV_1_5_n) { } else if (mFormat == FV_1_5_n) {
std::string value; std::string value;
XmlNode refChild = currentNode.child("ref"); XmlNode refChild = currentNode.child("ref");
@ -850,6 +849,7 @@ void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
} }
} }
} }
}
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------