diff options
Diffstat (limited to 'src/render/jobs/uniformblockbuilder.cpp')
| -rw-r--r-- | src/render/jobs/uniformblockbuilder.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/render/jobs/uniformblockbuilder.cpp b/src/render/jobs/uniformblockbuilder.cpp index 132c31d9e..ec6c72199 100644 --- a/src/render/jobs/uniformblockbuilder.cpp +++ b/src/render/jobs/uniformblockbuilder.cpp @@ -10,11 +10,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + namespace { const QString blockArray = QStringLiteral("[%1]"); @@ -97,8 +97,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(Shader // Retrieve set of {NameId -> PropertyValue} for Block const int fullBlockNameId = StringToInt::lookupId(fullBlockName); - if (!rShaderData->hasPropertyValuesForBlock(fullBlockNameId)) - rShaderData->generatePropertyValuesForBlock(fullBlockName); + rShaderData->generatePropertyValuesForBlockIfNeeded(fullBlockName); const ShaderData::PropertyValuesForBlock &propertiesForBlock = rShaderData->propertyValuesForBlock(fullBlockNameId); for (const auto &nameIdPropertyPair : propertiesForBlock) { |