diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:26 +0100 |
| commit | a2c7dbba0ad60cf17997f77372004339d4580a52 (patch) | |
| tree | c0f7f03107438b85031808a9581bf9adecc138ba /src/extras/defaults/qnormaldiffusemapmaterial.cpp | |
| parent | 2e26894fdd2d4593bee6ab9062f64a1f4210d619 (diff) | |
| parent | 5e94e34c5b9567980929e677357467806aacaf1a (diff) | |
Merge 5.10 into 5.10.0
Change-Id: I1d59f6d4f69c5ab33efe1a00a983a2af880ef79a
Diffstat (limited to 'src/extras/defaults/qnormaldiffusemapmaterial.cpp')
| -rw-r--r-- | src/extras/defaults/qnormaldiffusemapmaterial.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp index 687e59751..beed4085e 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -218,6 +218,9 @@ void QNormalDiffuseMapMaterialPrivate::handleTextureScaleChanged(const QVariant \since 5.7 \inherits Qt3DRender::QMaterial + \deprecated + \see Qt3DExtras::QDiffuseSpecularMaterial + The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. The relative strengths of these components are controlled by means of their reflectivity coefficients which are modelled as RGB triplets: |