From f37155d134742e08b2aa42480fa520412da18063 Mon Sep 17 00:00:00 2001 From: Wieland Hagen Date: Thu, 14 Jan 2016 19:31:22 +0100 Subject: Fixed RenderView Uniform setting for QNode values Change-Id: I3aac90e19019345892e08a2994ee04667a7058dc Reviewed-by: Paul Lemire --- src/render/backend/renderview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/render/backend') 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(value.type()) == qNodeIdTypeId) { + if (static_cast(value.userType()) == qNodeIdTypeId) { if ((tex = m_manager->textureManager()->lookupResource(value.value())) != Q_NULLPTR) { uniformPack.setTexture(name, tex->peerUuid()); @@ -624,7 +624,7 @@ void RenderView::setUniformBlockValue(ShaderParameterPack &uniformPack, { Q_UNUSED(shader) - if (static_cast(value.type()) == qNodeIdTypeId) { + if (static_cast(value.userType()) == qNodeIdTypeId) { Buffer *buffer = Q_NULLPTR; if ((buffer = m_manager->bufferManager()->lookupResource(value.value())) != Q_NULLPTR) { -- cgit v1.2.3