diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:14:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:14:52 +0200 |
| commit | 58400a90110e303f08c790a9ec436aa6555bb7ff (patch) | |
| tree | 6a95b7c31028634398b68f036def2c752fb07bf9 /src/quick/scenegraph | |
| parent | 68b2f86919546a5f4d998f8ababd5d0b5fb8dfa2 (diff) | |
| parent | c3741b6e04f2d4dd21748211e3650e3cf6830435 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idaaeba880a175166437e2a7266716c776c4483c6
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 078c86b27f..f17aa59e3e 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -222,7 +222,7 @@ static void qt_debug_remove_texture(QSGTexture* texture) \section1 Texture Atlasses - Some scene graph backens use texture atlasses, grouping multiple + Some scene graph backends use texture atlasses, grouping multiple small textures into one large texture. If this is the case, the function isAtlasTexture() will return true. Atlasses are used to aid the rendering algorithm to do better sorting which increases |