summaryrefslogtreecommitdiffstats
path: root/src/render/backend/uniform.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/backend/uniform.cpp')
-rw-r--r--src/render/backend/uniform.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/render/backend/uniform.cpp b/src/render/backend/uniform.cpp
index 41ee24967..17c26e6c7 100644
--- a/src/render/backend/uniform.cpp
+++ b/src/render/backend/uniform.cpp
@@ -38,6 +38,7 @@
****************************************************************************/
#include "uniform_p.h"
+#include "qabstracttexture.h"
QT_BEGIN_NAMESPACE
@@ -261,6 +262,11 @@ UniformValue UniformValue::fromVariant(const QVariant &variant)
memcpy(v.data<float>(), mat33.constData(), 9 * sizeof(float));
break;
}
+ if (variant.userType() == qMetaTypeId<Qt3DRender::QAbstractTexture *>()) {
+ // silently ignore null texture pointers as they are common while textures are loading
+ if (variant.value<Qt3DRender::QAbstractTexture *>() == nullptr)
+ break;
+ }
qWarning() << "Unknown uniform type or value:" << variant << "Please check your QParameters";
}
}