diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-01-25 12:16:52 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-07 15:18:31 +0000 |
| commit | d1a7fcf6969cfebe16c3590a01e7811fd4a718f3 (patch) | |
| tree | dc6c14d346cc633f5849612cb7d335f461e13d40 /src/render/materialsystem/shaderdata.cpp | |
| parent | 6931ac1c9461278baaddfef032101ab9e73694c4 (diff) | |
Removed factory member variable
The variable was removed from QBackendNode and subsequently
all areas it appeared.
Task-number: QTBUG-49682
Change-Id: I5904714b55aaefbe07ee11008ff49cd1d9b89950
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shaderdata.cpp')
| -rw-r--r-- | src/render/materialsystem/shaderdata.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 2301e0984..75144bc3a 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -317,10 +317,9 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(NodeManagers *managers) { } -Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend) const { ShaderData *backend = m_managers->shaderDataManager()->getOrCreateResource(frontend->id()); - backend->setFactory(factory); backend->setManagers(m_managers); backend->setPeer(frontend); return backend; |