diff options
Diffstat (limited to 'src/render/materialsystem/qshaderdata_p.h')
-rw-r--r-- | src/render/materialsystem/qshaderdata_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h index bfa139890..17faee9ed 100644 --- a/src/render/materialsystem/qshaderdata_p.h +++ b/src/render/materialsystem/qshaderdata_p.h @@ -62,7 +62,6 @@ namespace Qt3DRender { namespace { const int qVectorShaderDataTypeId = qMetaTypeId<QVector<QShaderData*> >(); -const int qShaderDataTypeId = qMetaTypeId<QShaderData*>(); } @@ -70,10 +69,10 @@ class QShaderDataPropertyReader: public PropertyReaderInterface { QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE { - QShaderData *shaderData = nullptr; + const auto node = v.value<Qt3DCore::QNode *>(); - if (v.userType() == qShaderDataTypeId && (shaderData = v.value<QShaderData *>()) != nullptr) { - return QVariant::fromValue(shaderData->id()); + if (node) { + return QVariant::fromValue(node->id()); } else if (v.userType() == qVectorShaderDataTypeId) { QVariantList vlist; const auto data_ = v.value<QVector<QShaderData *> >(); |