summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/material.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-30 18:17:35 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-03 10:20:47 +0000
commit03d62618692f93dfc1aa53e7e2245177432c2604 (patch)
tree010e65930c0db7ddd2080686cc63017e42320be2 /src/render/materialsystem/material.cpp
parent23b668235c9b902a2577b3ac6e369b77974382b4 (diff)
Remove QBackendNode::updateFromPeer()
Implemented a few missing initializeFromPeer() implementations along with the corresponding frontend node creation change creation functions. Adapted unit tests. Change-Id: I571e53a7b68a5544bd0e308df0baf7e52533306e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/material.cpp')
-rw-r--r--src/render/materialsystem/material.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index 34e23a3fb..4c0116dee 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -74,16 +74,6 @@ void Material::cleanup()
m_parameterPack.clear();
}
-void Material::updateFromPeer(Qt3DCore::QNode *node)
-{
- QMaterial *mat = static_cast<QMaterial *>(node);
- m_parameterPack.clear();
- if (mat->effect() != nullptr)
- m_effectUuid = mat->effect()->id();
- Q_FOREACH (QParameter *p, mat->parameters())
- m_parameterPack.appendParameter(p->id());
-}
-
void Material::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
{
const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QMaterialData>>(change);