summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2019-02-19 20:14:41 +0100
committerJanne Kangas <janne.kangas@qt.io>2019-03-15 09:08:37 +0000
commitac6c895566cff153e159a9b9a04d0a2c37c5fee3 (patch)
tree20b53ce14b5a78a5a93de2578e5a70644be11d06
parenta3ec00073723cd8835a8be7bdad960b4bcc21a6c (diff)
Add null object checks to datainputv2.3.0-beta3
Change-Id: Idbbfb06cb9fe176ad233c6e668743b7178b988ec Task-id: QT3DS-3077 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/runtime/api/q3dsdatainput.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/runtime/api/q3dsdatainput.cpp b/src/runtime/api/q3dsdatainput.cpp
index 0abeba4..d70f4ca 100644
--- a/src/runtime/api/q3dsdatainput.cpp
+++ b/src/runtime/api/q3dsdatainput.cpp
@@ -220,6 +220,9 @@ void Q3DSDataInput::setValue(const QVariant &value)
float Q3DSDataInput::min() const
{
Q_D(const Q3DSDataInput);
+ if (!d->presentation)
+ return 0.0f;
+
return Q3DSPresentationPrivate::get(d->presentation)->dataInputMin(d->name);
}
@@ -244,6 +247,10 @@ void Q3DSDataInput::setMin(float min)
float Q3DSDataInput::max() const
{
Q_D(const Q3DSDataInput);
+
+ if (!d->presentation)
+ return 0.0f;
+
return Q3DSPresentationPrivate::get(d->presentation)->dataInputMax(d->name);
}