diff options
| author | Torgeir Lilleskog <torgeir.lilleskog@hatteland.com> | 2013-12-05 12:34:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-06 13:12:58 +0100 |
| commit | 52dfe30201c8f6dad90604247643673025086275 (patch) | |
| tree | 7ccb3a1e7616e38488006a827cb0a9303cdb2656 /src/quick | |
| parent | 1f99bc15ffe7036a915cb4551480c4e5f8a46012 (diff) | |
Fix: QSGGeometry lineWidth in qsgbatchrenderer
lineWidth was ignored in the new scenegraph batchrenderer.
Regression from 5.1.1
Task-number: QTBUG-35346
Change-Id: I80eacc165f70b5f39d4a01cf458ab1a0e49cbd2d
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 676efe84bc..8ff68e20bc 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -2115,6 +2115,9 @@ void Renderer::renderUnmergedBatch(const Batch *batch) offset += a.tupleSize * size_of_type(a.type); } + if (g->drawingMode() == GL_LINE_STRIP || g->drawingMode() == GL_LINE_LOOP || g->drawingMode() == GL_LINES) + glLineWidth(g->lineWidth()); + if (g->indexCount()) glDrawElements(g->drawingMode(), g->indexCount(), g->indexType(), iOffset); else |