summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-09-26 11:10:27 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-09-27 12:50:53 +0000
commita286529cbe2ae51e6bf19aaea4203afd6b4884de (patch)
tree10fffea1dbd9d99a8b2f2d84d9c22f5cc7fb6db9 /src/render
parent8f2ced29ceedacd2f23f19af1813a5f351b43eec (diff)
Ensure meshName gets used in the functor
Change-Id: I9015546607b5663f1feada64bc03cb73d3538ef2 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/geometry/qmesh.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 614806df0..cf14ff4ff 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -261,8 +261,10 @@ QGeometry *MeshFunctor::operator()()
bool MeshFunctor::operator ==(const QGeometryFactory &other) const
{
const MeshFunctor *otherFunctor = functor_cast<MeshFunctor>(&other);
- if (otherFunctor != nullptr)
- return (otherFunctor->m_sourcePath == m_sourcePath);
+ if (otherFunctor != nullptr) {
+ return (otherFunctor->m_sourcePath == m_sourcePath
+ && otherFunctor->m_meshName == m_meshName);
+ }
return false;
}