From 61d6d98a9824936ce75031e6cf99d99cb5bf99d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Mon, 20 Jan 2020 10:04:43 +0200 Subject: Fix adding uTransform and vTransform to shaders These variables need to be added when any of the conditions are met, not when all conditions are met. Task-number: QT3DS-4043 Change-Id: I229fe4029a63ee4979dfe3fbf5d163fd95cfc40f Reviewed-by: Miikka Heikkinen --- src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp b/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp index 462cca8..41446e3 100644 --- a/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp +++ b/src/runtimerender/Qt3DSRenderDefaultMaterialShaderGenerator.cpp @@ -1038,7 +1038,7 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator // generated. // we rely on the linker to strip out what isn't necessary instead of explicitly stripping // it for code simplicity. - if (hasImage && hasLighting && hasLightmaps) { + if (hasImage || hasLighting || hasLightmaps) { fragmentShader.Append(" vec3 uTransform;"); fragmentShader.Append(" vec3 vTransform;"); } -- cgit v1.2.3