diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2016-01-14 19:31:22 +0100 |
|---|---|---|
| committer | Wieland Hagen <wieland.hagen@kdab.com> | 2016-01-14 21:51:40 +0000 |
| commit | f37155d134742e08b2aa42480fa520412da18063 (patch) | |
| tree | f509607aa221ec23ee16854f7a6f749c7ba4b267 | |
| parent | ee83fb6e9fd0da37fe5f41bc39d6cbdf4cfbfd60 (diff) | |
Fixed RenderView Uniform setting for QNode values
Change-Id: I3aac90e19019345892e08a2994ee04667a7058dc
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/render/backend/renderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 75a87e6cd..40a3ccbc9 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -596,7 +596,7 @@ void RenderView::setUniformValue(ShaderParameterPack &uniformPack, const QString // or a Qt3DCore::QNodeId corresponding to a Texture // ShaderData/Buffers would be handled as UBO/SSBO and would therefore // not be in the default uniform block - if (static_cast<QMetaType::Type>(value.type()) == qNodeIdTypeId) { + if (static_cast<QMetaType::Type>(value.userType()) == qNodeIdTypeId) { if ((tex = m_manager->textureManager()->lookupResource(value.value<Qt3DCore::QNodeId>())) != Q_NULLPTR) { uniformPack.setTexture(name, tex->peerUuid()); @@ -624,7 +624,7 @@ void RenderView::setUniformBlockValue(ShaderParameterPack &uniformPack, { Q_UNUSED(shader) - if (static_cast<QMetaType::Type>(value.type()) == qNodeIdTypeId) { + if (static_cast<QMetaType::Type>(value.userType()) == qNodeIdTypeId) { Buffer *buffer = Q_NULLPTR; if ((buffer = m_manager->bufferManager()->lookupResource(value.value<Qt3DCore::QNodeId>())) != Q_NULLPTR) { |