FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow "texture-path" XML entries to be present but empty.

Browse Source 
This had worked with previous FG versions and is used by many models -
so it shouldn't be treated as an error now.
This commit is contained in:
ThorstenB
2012-04-30 18:29:44 +02:00
parent 87c744b88b
commit ab7d2a4bcc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
simgear/scene/model/SGReaderWriterXML.cxx
View File

@@ -247,10 +247,13 @@ sgLoad3DModel_internal(const SGPath& path,
if (props->hasValue("/texture-path")) {
string texturePathStr = props->getStringValue("/texture-path");
texturepath = SGModelLib::findDataFile(texturePathStr, NULL, modelDir);
if (texturepath.isNull())
throw sg_io_exception("Texture file not found: '" + texturePathStr + "'",
path.str());
if (!texturePathStr.empty())
{
texturepath = SGModelLib::findDataFile(texturePathStr, NULL, modelDir);
if (texturepath.isNull())
throw sg_io_exception("Texture file not found: '" + texturePathStr + "'",
path.str());
}
}
} else {
model = new osg::Node;