summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-06-12 15:43:39 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-06-15 11:28:58 +0000
commit60cb61f9d70ec52f3193bac44384099d921827b3 (patch)
treed24608c2e7c438f603c8e566e1b5a45f29d6afcd /src/render/defaults/qnormaldiffusemapalphamaterial.cpp
parent6f93508bcd38d8d0fa524ac00d65b518fac0d82a (diff)
Doc: Fix multiple documentation issuesv5.5.0-rc1
- Restore qt3d-index.html as the main landing page. Needed for external linking. - Fix \inmodule commands for Renderer classes - Add proper group so that all three modules are listed on the landing page, both C++ and QML modules - Remove qt3drenderer-index.html (to be consistent with Qt3DCore), copy contents over to the module page and to a new file, qt3d-examples.qdoc. - Fix indexTitles in qdocconf files, and subprojects for Renderer QML types and Qt3D examples Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusemapalphamaterial.cpp')
-rw-r--r--src/render/defaults/qnormaldiffusemapalphamaterial.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 88b9280f4..03e3d9a4e 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.