diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-08-25 14:57:09 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-08-25 14:57:09 +0100 |
| commit | b8372b52809378f860dfb0a9a9a97b30b5ad1a08 (patch) | |
| tree | 271b70645f97f7fbb97c04c2d8337b781d042bcd /src/extras | |
| parent | 7a3db1facaac54053af5c8956ec04fcd8762a311 (diff) | |
| parent | 150af04197682ccdbab509a95758fcdf957f63b2 (diff) | |
Merge branch '5.7' into 5.8
Conflicts:
tests/auto/input/input.pro
Change-Id: Ic89c7d9093c95bc1c5ca50f04ed34c00b5f261f4
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/defaults/qnormaldiffusemapmaterial.cpp | 3 | ||||
| -rw-r--r-- | src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp index 01d67a477..c38756c98 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -86,8 +86,9 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() m_diffuseTexture->setMaximumAnisotropy(16.0f); m_normalTexture->setMagnificationFilter(QAbstractTexture::Linear); - m_normalTexture->setMinificationFilter(QAbstractTexture::Linear); + m_normalTexture->setMinificationFilter(QAbstractTexture::LinearMipMapLinear); m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); + m_normalTexture->setGenerateMipMaps(true); m_normalTexture->setMaximumAnisotropy(16.0f); } diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp index 6d54b9535..3c26fde5a 100644 --- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -87,8 +87,9 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva m_diffuseTexture->setMaximumAnisotropy(16.0f); m_normalTexture->setMagnificationFilter(QAbstractTexture::Linear); - m_normalTexture->setMinificationFilter(QAbstractTexture::Linear); + m_normalTexture->setMinificationFilter(QAbstractTexture::LinearMipMapLinear); m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); + m_normalTexture->setGenerateMipMaps(true); m_normalTexture->setMaximumAnisotropy(16.0f); m_specularTexture->setMagnificationFilter(QAbstractTexture::Linear); |