diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-03-31 11:26:36 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-05-10 12:25:31 +0000 |
commit | 90ba9328495574f8fbd745fb9825bf02e8c2f28d (patch) | |
tree | e09d595f381781a85674f9494af71eba70f42623 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
parent | b43e70b9dde614a91d6c9f993c3b444cd113e4e2 (diff) |
FrameGraph: allow the FrameGraph tree to contain any kind of Nodes
Change-Id: Ib5a6ea27610dfad3352adacd57c8f0f02c97f31f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
-rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index a2b2fc705..6c690b9fa 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -97,7 +97,6 @@ #include <Qt3DQuickRenderer/quick3dtexture.h> #include <Qt3DQuickRenderer/private/shaderpropertyparser_p.h> #include <Qt3DQuickRenderer/quick3drenderpass.h> -#include <Qt3DQuickRenderer/quick3dframegraphitem.h> #include <Qt3DQuickRenderer/quick3dsortmethod.h> #include <Qt3DQuickRenderer/quick3dparameter.h> #include <Qt3DQuickRenderer/quick3dshaderdata.h> @@ -205,7 +204,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterExtendedType<Qt3D::QViewport, Qt3D::Render::Quick::Quick3DViewport>(uri, 2, 0, "Viewport"); qmlRegisterExtendedType<Qt3D::QRenderTargetSelector, Qt3D::Render::Quick::Quick3DRenderTargetSelector>(uri, 2, 0, "RenderTargetSelector"); qmlRegisterType<Qt3D::QClearBuffer>(uri, 2, 0, "ClearBuffer"); - qmlRegisterExtendedUncreatableType<Qt3D::QFrameGraphNode, Qt3D::Render::Quick::Quick3DFrameGraphItem>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class")); + qmlRegisterUncreatableType<Qt3D::QFrameGraphNode>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class")); qmlRegisterExtendedType<Qt3D::QStateSet, Qt3D::Render::Quick::Quick3DStateSet>(uri, 2, 0, "StateSet"); qmlRegisterType<Qt3D::QNoDraw>(uri, 2, 0, "NoDraw"); qmlRegisterType<Qt3D::QFrameGraph>(uri, 2, 0, "FrameGraph"); |