From d404dbfcebfbb081f48cba30751c2a0212da16b3 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Wed, 27 Sep 2017 18:21:20 +0700 Subject: [PATCH] Correct UBlendMode2Cycle::update() Fixed World Driver Championship shadows are.....grey! #1596 --- .../glsl_CombinerProgramUniformFactory.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp index 3756d988..21f3b44f 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp @@ -303,25 +303,21 @@ public: void update(bool _force) override { - int forceBlend1 = 1; - uBlendMux1.set(gDP.otherMode.c1_m1a, gDP.otherMode.c1_m1b, gDP.otherMode.c1_m2a, gDP.otherMode.c1_m2b, _force); - int forceBlend2 = gDP.otherMode.forceBlender; - - if (forceBlend2 != 0) { - uBlendMux2.set(gDP.otherMode.c2_m1a, - gDP.otherMode.c2_m1b, - gDP.otherMode.c2_m2a, - gDP.otherMode.c2_m2b, - _force); - } + uBlendMux2.set(gDP.otherMode.c2_m1a, + gDP.otherMode.c2_m1b, + gDP.otherMode.c2_m2a, + gDP.otherMode.c2_m2b, + _force); + const int forceBlend1 = 1; uForceBlendCycle1.set(forceBlend1, _force); + const int forceBlend2 = gDP.otherMode.forceBlender; uForceBlendCycle2.set(forceBlend2, _force); }