Merge remote-tracking branch 'origin/5.8' into devwip/particles

Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397

1 files changed, 6 insertions, 6 deletions

diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index b13c0d5ae..2cd026422 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -68,7 +68,7 @@ void Parameter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch
     const auto &data = typedChange->data;
     m_name = data.name;
     m_nameId = StringToInt::lookupId(m_name);
-    m_value = data.backendValue;
+    m_uniformValue = UniformValue::fromVariant(data.backendValue);
 }
 
 void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
@@ -80,7 +80,7 @@ void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_name = propertyChange->value().toString();
             m_nameId = StringToInt::lookupId(m_name);
         } else if (propertyChange->propertyName() == QByteArrayLiteral("value")) {
-            m_value = propertyChange->value();
+            m_uniformValue = UniformValue::fromVariant(propertyChange->value());
         }
         markDirty(AbstractRenderer::AllDirty);
     }
@@ -93,14 +93,14 @@ QString Parameter::name() const
     return m_name;
 }
 
-QVariant Parameter::value() const
+int Parameter::nameId() const Q_DECL_NOTHROW
 {
-    return m_value;
+    return m_nameId;
 }
 
-int Parameter::nameId() const Q_DECL_NOTHROW
+UniformValue Parameter::uniformValue() const
 {
-    return m_nameId;
+    return m_uniformValue;
 }
 
 } // namespace Render