summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Krause <volker.krause@kdab.com>2016-03-30 20:50:35 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-03-30 19:23:36 +0000
commit24df3c93eb7ad135b39b415175da104e1e482b6e (patch)
tree55754d208953bb4fe14121fd033da3df79688299
parent769651d085397acc77a4e65cc49daccca831a9f2 (diff)
Match the amount of vertices createTorusVertexData() actually generates.
This fixes invalid memory access in the bounding volume calculation, which causes random crashes in every torus-using example. Change-Id: I569bed3bb8fee34555f7f9ce33ef9db710e43b24 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/geometry/qtorusgeometry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/geometry/qtorusgeometry.cpp b/src/render/geometry/qtorusgeometry.cpp
index 8271f93da..9c88b125f 100644
--- a/src/render/geometry/qtorusgeometry.cpp
+++ b/src/render/geometry/qtorusgeometry.cpp
@@ -355,7 +355,7 @@ QTorusGeometry::~QTorusGeometry()
void QTorusGeometry::updateVertices()
{
Q_D(QTorusGeometry);
- const int nVerts = (d->m_slices + 1) * (d->m_rings + 1);
+ const int nVerts = d->m_slices * (d->m_rings + 1);
d->m_positionAttribute->setCount(nVerts);
d->m_texCoordAttribute->setCount(nVerts);
d->m_normalAttribute->setCount(nVerts);