From: Jerome St-Louis Date: Wed, 3 Aug 2016 00:18:02 +0000 (-0400) Subject: ecere/gfx/drivers/OpenGL/Default Shader: Fixed color being set with noLighting X-Git-Tag: 0.44.15~66 X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=6458adeba7a367ce7b4f0fa6f624e628aa6b4678 ecere/gfx/drivers/OpenGL/Default Shader: Fixed color being set with noLighting - Fixes black sky cube in model viewer --- diff --git a/ecere/src/gfx/drivers/gl3/defaultShader.ec b/ecere/src/gfx/drivers/gl3/defaultShader.ec index ef4640e..edb74cd 100644 --- a/ecere/src/gfx/drivers/gl3/defaultShader.ec +++ b/ecere/src/gfx/drivers/gl3/defaultShader.ec @@ -629,6 +629,7 @@ public: ((DefaultShaderBits)state).twoSided = material.flags.doubleSided && !material.flags.singleSideLight; ((DefaultShaderBits)state).lightBits = material.flags.noLighting ? 0 : lightBits; ((DefaultShaderBits)state).lighting = (!material.flags.noLighting && lightBits) ? true : false; + color[0] = 1, color[1] = 1, color[2] = 1, color[3] = material.opacity; diffuse[0] = material.diffuse.r, diffuse[1] = material.diffuse.g, diffuse[2] = material.diffuse.b, diffuse[3] = material.opacity; ambient[0] = material.ambient.r, ambient[1] = material.ambient.g, ambient[2] = material.ambient.b; specular[0] = material.specular.r, specular[1] = material.specular.g, specular[2] = material.specular.b;