diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-18 17:30:58 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-18 17:30:58 +0000 |
commit | 5e94e34c5b9567980929e677357467806aacaf1a (patch) | |
tree | d5b3d6fd82fba5f3a3241ee4a261ab53587fd9d2 /src/render/materialsystem | |
parent | b58719b2222fd3b3527758aaf482b1635af7857c (diff) | |
parent | a951564557c91fdbb6974c089eec374d51011ad1 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/render/materialsystem')
-rw-r--r-- | src/render/materialsystem/parameter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 6671e4943..f00df3c90 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -87,10 +87,13 @@ void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) if (propertyChange->propertyName() == QByteArrayLiteral("name")) { m_name = propertyChange->value().toString(); m_nameId = StringToInt::lookupId(m_name); + markDirty(AbstractRenderer::MaterialDirty | AbstractRenderer::ParameterDirty); } else if (propertyChange->propertyName() == QByteArrayLiteral("value")) { m_uniformValue = UniformValue::fromVariant(propertyChange->value()); + markDirty(AbstractRenderer::ParameterDirty); + } else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) { + markDirty(AbstractRenderer::MaterialDirty | AbstractRenderer::ParameterDirty); } - markDirty(AbstractRenderer::AllDirty); } BackendNode::sceneChangeEvent(e); |