diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-08-07 07:47:31 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-08-07 07:47:31 +0200 |
| commit | 8af94d9a048f7d26a8137c3c51dcf47605fcf4b6 (patch) | |
| tree | e5ef1654a217bf82f0bb3549d1c8f1762f1a9f25 /src/extras/defaults/qdiffusespecularmaterial.cpp | |
| parent | 44470868450c440ca874ba585e2b71dfc8e89f1d (diff) | |
| parent | 7be8029d4c2cd0ce24f0277d6ee87041161edab4 (diff) | |
Merge remote-tracking branch 'qt-gerrit/dev' into wip/refactor
Change-Id: I61324b258ed28d420c96acafd4e624655ffb40e1
Diffstat (limited to 'src/extras/defaults/qdiffusespecularmaterial.cpp')
| -rw-r--r-- | src/extras/defaults/qdiffusespecularmaterial.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/extras/defaults/qdiffusespecularmaterial.cpp b/src/extras/defaults/qdiffusespecularmaterial.cpp index be187b46a..8938ce19a 100644 --- a/src/extras/defaults/qdiffusespecularmaterial.cpp +++ b/src/extras/defaults/qdiffusespecularmaterial.cpp @@ -385,12 +385,20 @@ QVariant QDiffuseSpecularMaterial::normal() const Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ /*! \qmlproperty real DiffuseSpecularMaterial::textureScale Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. + + When used in conjunction with WrapMode.Repeat, textureScale provides a simple + way to tile a texture across a surface. For example, a texture scale of \c 4.0 + would result in 16 (4x4) tiles. */ float QDiffuseSpecularMaterial::textureScale() const { |