Fix new project structure problem with effect and custom material textures

Task-number: QT3DS-2027
Task-number: QT3DS-2119
Change-Id: If9382f38ea8f87f14b23f76a81e448072b9f08c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 15 insertions, 0 deletions

diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp
index c33964f..b475c2a 100644
--- a/src/runtime/q3dsuippresentation.cpp
+++ b/src/runtime/q3dsuippresentation.cpp
@@ -3946,6 +3946,21 @@ QString Q3DSUipPresentation::assetFileName(const QString &xmlFileNameRef, int *p
         fn += QLatin1Char('/');
         fn += rawName;
         path = QFileInfo(fn).absoluteFilePath();
+
+        // We need the path to uia files for some assets, for example the textures of effects
+        // As that is not readily available here, go up the directory hoping to find the
+        // file wanted. We're using 3 levels for now, as that is what Editor is using as well.
+        if (!QFileInfo(path).exists()) {
+            int loops = 0;
+            QString searchPath = QFileInfo(d->sourceFile).canonicalPath();
+            searchPath.append(QLatin1String("/../"));
+            while (!QFileInfo(searchPath + rawName).exists() && ++loops < 3)
+                searchPath.append(QLatin1String("../"));
+            if (QFileInfo(path).exists())
+                path = searchPath + rawName;
+            else
+                path = QFileInfo(fn).absoluteFilePath();
+        }
     }
     return path;
 }