From 63a764a61b7b2fd64bdfa2fdf52a546a004457cd Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 29 Mar 2019 13:28:12 +0100 Subject: [PATCH] display: fix missed cases in 364d5d82fe4b33acd8679a66ecf8f9f55eeb00c8 --- panda/src/display/graphicsStateGuardian.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx index 5931024786..fd64170f63 100644 --- a/panda/src/display/graphicsStateGuardian.cxx +++ b/panda/src/display/graphicsStateGuardian.cxx @@ -1489,7 +1489,7 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, } else if (index == 0) { // Apply the default OpenGL lights otherwise. // Special exception for light 0, which defaults to white. - t.set_row(0, _light_color_scale); + t.set_row(0, LVecBase4(1, 1, 1, 1)); } return &t; } @@ -1534,7 +1534,6 @@ fetch_specified_member(const NodePath &np, CPT_InternalName attrib, LMatrix4 &t) Light *light = node->as_light(); nassertr(light != nullptr, &LMatrix4::ident_mat()); LColor c = light->get_color(); - c.componentwise_mult(_light_color_scale); t.set_row(3, c); return &t;