From d682df243a49d1f76747eaf7073549177d21ac15 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Tue, 4 Sep 2018 14:27:31 +0200
Subject: [PATCH] Fix loading of older OBJ8 CSL modelsets

- Fix support for older modelsets not using the texture for OBJ8 feature
- Small error when xsb_aircraft.txt was outside the object folder

ref T326
---
 src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp | 4 ++--
 src/xswiftbus/libxplanemp                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
index 50619802e..1674142a8 100644
--- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
+++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
@@ -481,8 +481,6 @@ namespace BlackMisc
                 }
 
                 package.planes.push_back(CSLPlane());
-                // Package name and object name uniquely identify an OBJ8 aircraft.
-                // File path just points to the package root.
                 return true;
             }
 
@@ -521,6 +519,8 @@ namespace BlackMisc
                 if (tokens.size() >= 5)
                 {
                     // Load regular texture
+                    // Replace package root dir again back to package name
+                    dirNames.replace(0, package.name);
                     QString relativeTexPath = dirNames.join('/') + '/' + tokens[4];
                     normalizePath(relativeTexPath);
                     QString absoluteTexPath(relativeTexPath);
diff --git a/src/xswiftbus/libxplanemp b/src/xswiftbus/libxplanemp
index ef11f55ad..9daa1a1c1 160000
--- a/src/xswiftbus/libxplanemp
+++ b/src/xswiftbus/libxplanemp
@@ -1 +1 @@
-Subproject commit ef11f55adc4ad6e3888a9f56981172e73d2111db
+Subproject commit 9daa1a1c127aaed18ee32039757a363eaa0cceeb