diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-04-24 13:43:56 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-04-27 11:57:33 +0100 |
| commit | 6c1758d35e20655f46ba3696671068f4862c8878 (patch) | |
| tree | d4b4fc2ae8f5a4512de4eb015667b024b6a8e6b9 /src/render/materialsystem/shaderdata.cpp | |
| parent | b7967a8abcdac438a1f31800b71e219e3c52c24a (diff) | |
| parent | 37735f11f9437b916b194cfd48c452c7c70682f8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
Diffstat (limited to 'src/render/materialsystem/shaderdata.cpp')
| -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 44a41a240..6f113d592 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -160,7 +160,7 @@ ShaderData *ShaderData::lookupResource(QNodeId id) } // RenderCommand updater jobs -QVariant ShaderData::getTransformedProperty(const QString &name, const Matrix4x4 &viewMatrix) +QVariant ShaderData::getTransformedProperty(const QString &name, const Matrix4x4 &viewMatrix) const noexcept { // Note protecting m_worldMatrix at this point as we assume all world updates // have been performed when reaching this point |