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

This had worked with previous FG versions and is used by many models - so it shouldn't be treated as an error now.
2012-04-30 18:29:44 +02:00
parent 87c744b88b
commit ab7d2a4bcc
1 changed files with 7 additions and 4 deletions
@@ -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 (!texturePathStr.empty())
-                if (texturepath.isNull())
+                {
-                    throw sg_io_exception("Texture file not found: '" + texturePathStr + "'",
+                    texturepath = SGModelLib::findDataFile(texturePathStr, NULL, modelDir);
-                            path.str());
+                    if (texturepath.isNull())
                        throw sg_io_exception("Texture file not found: '" + texturePathStr + "'",
                                path.str());
                }
            }
        } else {
            model = new osg::Node;