diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-10-12 16:59:18 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-14 18:53:10 +0000 |
| commit | 52bcbd19273842c7b46d353a2cc52d3d0229c00d (patch) | |
| tree | 7eb094f79bdc645215071b46fd1ea12bba0a32d7 /src/render/materialsystem/material.cpp | |
| parent | 6cf4712bda7d3453ddf728f5903374abd2f4efc9 (diff) | |
QMaterial: remove NodeAdded/Remove notifications on Effect
Rely on the parent being set for inline declaration and the emit effectChanged
to automatically send notifications.
Updated unit tests accordingly.
Change-Id: I7304309ea248da5e15db3dea4d556162af5e940e
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/materialsystem/material.cpp')
| -rw-r--r-- | src/render/materialsystem/material.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index faf934d3e..ad7aa0eae 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -88,6 +88,8 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) case NodeUpdated: { if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) m_enabled = propertyChange->value().toBool(); + else if (propertyChange->propertyName() == QByteArrayLiteral("effect")) + m_effectUuid = propertyChange->value().value<QNodeId>(); break; } // Check for shader parameter |