diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:32:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:32:37 +0200 |
| commit | 57e982442a4df1fd3a4fd063964aeb3895ae3e12 (patch) | |
| tree | 55ee517c952eb299c5f41baf629f62bf231ea3f1 /src/render/defaults/qnormaldiffusemapalphamaterial.cpp | |
| parent | 8f58119cd18d69fac28528f0a7536cb9fccc15e3 (diff) | |
| parent | cdd39567c3b0bd0f9440dead548954d5230a611f (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/render/defaults/qforwardrenderer.cpp
src/render/doc/qt3drender.qdocconf
Change-Id: I1c4a15d2b57980dca82fa420ab6ef8c48c049a2c
Diffstat (limited to 'src/render/defaults/qnormaldiffusemapalphamaterial.cpp')
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapalphamaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index 6854e7f1d..0c236b56d 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -129,7 +129,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() \brief The QNormalDiffuseMapAlphaMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component is read from a texture map and the normals of the mesh being rendered from a normal texture map. In addition, it defines an alpha to coverage and a depth test to be performed in the rendering pass. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. |