summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-07-20 08:44:02 +0200
committerPaul Lemire <paul.lemire@kdab.com>2018-07-20 19:47:24 +0000
commit9e20a1d578a44c6bdb98a9aacd7daf7aaf166e3e (patch)
tree1629fb8b05871e8b27c19de9c9d0e96f8efa8640
parent2fe1ab371566b1fd99e7a4c109cbb2f07269175e (diff)
QTextureImage: warn user that remote urls on QTextureImage aren't yet supported
Change-Id: I19debff59679901ddf1763062ef917023d413fd5 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/render/texture/qtextureimage.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 845e14233..6bcdaba7d 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -292,7 +292,17 @@ QTextureImageDataPtr QImageTextureDataFunctor::operator ()()
// We assume that a texture image is going to contain a single image data
// For compressed dds or ktx textures a warning should be issued if
// there are layers or 3D textures
- return TextureLoadingHelper::loadTextureData(m_url, false, m_mirrored);
+
+ if (!Qt3DCore::QDownloadHelperService::isLocal(m_url))
+ qWarning() << "QTextureImage only supports local url";
+
+ QTextureImageDataPtr data = TextureLoadingHelper::loadTextureData(m_url, false, m_mirrored);
+
+ // Data failed to load
+ // Still create an empty QTextureImage to avoid trying to reload it every frame
+ if (!data)
+ data = QTextureImageDataPtr::create();
+ return data;
}
bool QImageTextureDataFunctor::operator ==(const QTextureImageDataGenerator &other) const