diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-10 15:05:47 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-12 10:03:08 +0000 |
| commit | b47ab75d17db2be57c941b4b72ec51c926a665d9 (patch) | |
| tree | 7381d69c06944d1e85ca745206da7a51eebcbf6e /src/render/geometry/geometryrenderer.cpp | |
| parent | 83d81bc82eb7ca8d2ed113aac14f9a2d0a40a362 (diff) | |
Hide deprecated functor API
Now private for QTextureGenerator and QGeometryFactory updates.
QTextureImageDataGenerator remains for now as it was not previously
deprecated and, mainly, it's the only API to get data into an image.
Consequently, QAbstractFunctor has been un-deprecated.
Change-Id: Ie6691bc402ad603d63abcf1ec9fc3513091f5740
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry/geometryrenderer.cpp')
| -rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 65094e071..7a726e03f 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -130,7 +130,9 @@ void GeometryRenderer::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) m_primitiveType = node->primitiveType(); m_dirty |= (node->geometry() && m_geometryId != node->geometry()->id()) || (!node->geometry() && !m_geometryId.isNull()); m_geometryId = node->geometry() ? node->geometry()->id() : Qt3DCore::QNodeId(); - QGeometryFactoryPtr newFunctor = node->geometryFactory(); + + const QGeometryRendererPrivate *dnode = static_cast<const QGeometryRendererPrivate *>(QNodePrivate::get(frontEnd)); + QGeometryFactoryPtr newFunctor = dnode->m_geometryFactory; const bool functorDirty = ((m_geometryFactory && !newFunctor) || (!m_geometryFactory && newFunctor) || (m_geometryFactory && newFunctor && !(*newFunctor == *m_geometryFactory))); |