diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:03:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:03:34 +0200 |
| commit | 94353454aa20b3fb51b53276f94024981925e5d3 (patch) | |
| tree | 230858edeac7bee7281b6f72d611ab640b7fec85 /src/render/materialsystem | |
| parent | 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 (diff) | |
| parent | 309c3139f8111ea246dd3a1f996578d0b35bb151 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id2885cdbb45f8aa701e218b6201f0a3732b7ef11
Diffstat (limited to 'src/render/materialsystem')
| -rw-r--r-- | src/render/materialsystem/shaderdata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index de423c3c2..130333898 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -245,7 +245,7 @@ void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) // Note we aren't notified about nested QShaderData in this call // only scalar / vec properties m_originalProperties.insert(propertyName, propertyValue); - BackendNode::markDirty(AbstractRenderer::AllDirty); + BackendNode::markDirty(AbstractRenderer::ParameterDirty); } BackendNode::sceneChangeEvent(e); |