diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 20:27:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 20:27:11 +0100 |
| commit | 21909674d5dea747287eb45bffbbdbb98fe3b627 (patch) | |
| tree | 77e12451591bed1b4aa4b2712f050e65ce4d3499 /src/render/defaults/qdiffusespecularmapmaterial.cpp | |
| parent | dcf62b73016080827aa23bea0d40451049d5595d (diff) | |
| parent | 5d816e2a5de1ba69e51167f6d5ec555d4a08b184 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/core/doc/qt3dcore.qdocconf
Change-Id: I3e0b4288daf6be5cd0d274ab34223e7a9ea2ec18
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 16a758e2e..109057740 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -129,7 +129,7 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapEffect->addParameter(m_lightIntensityParameter); m_diffuseSpecularMapEffect->addParameter(m_textureScaleParameter); - static_cast<QMaterial *>(q_ptr)->setEffect(m_diffuseSpecularMapEffect); + q_func()->setEffect(m_diffuseSpecularMapEffect); } /*! |