diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-21 03:01:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-21 03:01:14 +0200 |
| commit | 213f8951a12921870987626ec7522672b7bbfacb (patch) | |
| tree | 0303859cc8f04d11b3979736237fe81cf8cb4ac6 /src/render/frontend | |
| parent | 825f99706f5a2d9f4ed1db9841a5a5ca9e4dee43 (diff) | |
| parent | 9e20a1d578a44c6bdb98a9aacd7daf7aaf166e3e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic7b387e96c7976772c6c1a5f88da52524d9b4010
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 19399edc9..ccec826ff 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -253,9 +253,8 @@ void QRenderAspectPrivate::registerBackendTypes() q->registerBackendType<Qt3DCore::QJoint>(QSharedPointer<Render::JointFunctor>::create(m_renderer, m_nodeManagers->jointManager(), m_nodeManagers->skeletonManager())); // Textures - q->registerBackendType<QAbstractTexture>(QSharedPointer<Render::TextureFunctor>::create(m_renderer, m_nodeManagers->textureManager(), m_nodeManagers->textureImageManager())); + q->registerBackendType<QAbstractTexture>(QSharedPointer<Render::TextureFunctor>::create(m_renderer, m_nodeManagers->textureManager())); q->registerBackendType<QAbstractTextureImage>(QSharedPointer<Render::TextureImageFunctor>::create(m_renderer, - m_nodeManagers->textureManager(), m_nodeManagers->textureImageManager(), m_nodeManagers->textureImageDataManager())); |