diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-19 11:16:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-19 14:30:02 +0000 |
| commit | 7b2d0fdba63c0aca5e37f59706455618787a44eb (patch) | |
| tree | 726ce3861108cd44ee2dcd7f7c94fe6f8d6bece9 /src/render/frontend | |
| parent | 809c753359a6a6c5773b0494a46b1d82f3965db6 (diff) | |
| parent | 06879a5cfca3bca23e8cdc22be48563a77fd15d9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 82cc5956a..f2b101012 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -249,7 +249,7 @@ void QRenderAspectPrivate::registerBackendTypes() q->registerBackendType<QGeometry>(QSharedPointer<Render::NodeFunctor<Render::Geometry, Render::GeometryManager> >::create(m_renderer)); q->registerBackendType<QGeometryRenderer>(QSharedPointer<Render::GeometryRendererFunctor>::create(m_renderer, m_nodeManagers->geometryRendererManager())); q->registerBackendType<Qt3DCore::QArmature>(QSharedPointer<Render::NodeFunctor<Render::Armature, Render::ArmatureManager>>::create(m_renderer)); - q->registerBackendType<Qt3DCore::QSkeletonLoader>(QSharedPointer<Render::SkeletonFunctor>::create(m_renderer, m_nodeManagers->skeletonManager(), m_nodeManagers->jointManager())); + q->registerBackendType<Qt3DCore::QAbstractSkeleton>(QSharedPointer<Render::SkeletonFunctor>::create(m_renderer, m_nodeManagers->skeletonManager(), m_nodeManagers->jointManager())); q->registerBackendType<Qt3DCore::QJoint>(QSharedPointer<Render::JointFunctor>::create(m_renderer, m_nodeManagers->jointManager(), m_nodeManagers->skeletonManager())); // Textures @@ -324,6 +324,9 @@ void QRenderAspectPrivate::unregisterBackendTypes() unregisterBackendType<QComputeCommand>(); unregisterBackendType<QGeometry>(); unregisterBackendType<QGeometryRenderer>(); + unregisterBackendType<Qt3DCore::QArmature>(); + unregisterBackendType<Qt3DCore::QAbstractSkeleton>(); + unregisterBackendType<Qt3DCore::QJoint>(); // Textures unregisterBackendType<QAbstractTexture>(); |