From e2c4af05bdb97a262be70085f58461807b71308f Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 19 Jan 2018 11:42:31 -0800 Subject: [PATCH] Don't process empty images --- .../model-networking/src/model-networking/TextureCache.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index 2718099942..fb75123b43 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -265,6 +265,10 @@ gpu::TexturePointer getFallbackTextureForType(image::TextureUsage::Type type) { /// Returns a texture version of an image file gpu::TexturePointer TextureCache::getImageTexture(const QString& path, image::TextureUsage::Type type, QVariantMap options) { QImage image = QImage(path); + if (image.isNull()) { + qCWarning(networking) << "Unable to load required resource texture" << path; + return nullptr; + } auto loader = image::TextureUsage::getTextureLoaderForType(type, options); return gpu::TexturePointer(loader(std::move(image), path.toStdString(), false)); }