diff options
| author | Tero Tiittanen <tero.tiittanen@nokia.com> | 2011-11-15 17:17:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 07:44:36 +0100 |
| commit | 93b6de38ad662bdfc1c89f11151ebe1fbbca96c7 (patch) | |
| tree | d3dcb0090a9ca3cea5844458856222c7f2635b41 /src/declarative/scenegraph/util/qsgtexturematerial.cpp | |
| parent | e400a3627d3c675be374759307ac49e9b921804d (diff) | |
Fixed some copy-paste errors is documentation.
Change-Id: I882df7dffea032e9fae16e87f48f70c5d26beb26
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph/util/qsgtexturematerial.cpp')
| -rw-r--r-- | src/declarative/scenegraph/util/qsgtexturematerial.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.cpp b/src/declarative/scenegraph/util/qsgtexturematerial.cpp index 43bfbcad57..0bee81993c 100644 --- a/src/declarative/scenegraph/util/qsgtexturematerial.cpp +++ b/src/declarative/scenegraph/util/qsgtexturematerial.cpp @@ -327,7 +327,7 @@ int QSGOpaqueTextureMaterial::compare(const QSGMaterial *o) const The textured material will fill every pixel in a geometry with the supplied texture. - The geometry to be rendered with an opaque texture material requires + The geometry to be rendered with a texture material requires vertices in attribute location 0 and texture coordinates in attribute location 1. The texture coordinate is a 2-dimensional floating-point tuple. The QSGGeometry::defaultAttributes_TexturedPoint2D returns an @@ -339,9 +339,9 @@ int QSGOpaqueTextureMaterial::compare(const QSGMaterial *o) const The rendering state is set on the texture instance just before it is bound. - The opaque textured material respects the current matrix and the alpha - channel of the texture. It will disregard the accumulated opacity in - the scenegraph. + The textured material respects the current matrix and the alpha + channel of the texture. It will also respect the accumulated opacity + in the scenegraph. A texture material must have a texture set before it is used as a material in the scene graph. |