From: ehofman <ehofman>
Date: Mon, 5 Jul 2004 13:40:37 +0000 (+0000)
Subject: Remove the need to append a trailing / to the texture-path string.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8fe37cea5100e74c10e6dcee786d881ddbabf17e;p=simgear.git

Remove the need to append a trailing / to the texture-path string.
---

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index f23f59ec..e2059c9f 100644
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -249,7 +249,10 @@ sgLoad3DModel( const string &fg_root, const string &path,
                                 // Assume that textures are in
                                 // the same location as the XML file.
   if (model == 0) {
-    ssgTexturePath((char *)texturepath.dir().c_str());
+    if (texturepath.extension() != "")
+          texturepath = texturepath.dir();
+
+    ssgTexturePath((char *)texturepath.c_str());
     model = (ssgBranch *)ssgLoad((char *)modelpath.c_str());
     if (model == 0)
       throw sg_exception("Failed to load 3D model");