From 22d5c2f8dd35eed6c9bc8f1c66fc56f4cc012903 Mon Sep 17 00:00:00 2001 From: Ed Swartz Date: Mon, 3 Aug 2015 08:11:52 -0500 Subject: [PATCH] For tinydisplay, don't lose color/alpha scale when lighting --- panda/src/tinydisplay/td_light.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/tinydisplay/td_light.cxx b/panda/src/tinydisplay/td_light.cxx index a7b03a3bc5..c49b47e4b4 100644 --- a/panda/src/tinydisplay/td_light.cxx +++ b/panda/src/tinydisplay/td_light.cxx @@ -127,9 +127,9 @@ void gl_shade_vertex(GLContext *c,GLVertex *v) B+=att * lB; } - v->color.v[0]=clampf(R,0,1); - v->color.v[1]=clampf(G,0,1); - v->color.v[2]=clampf(B,0,1); - v->color.v[3]=A; + v->color.v[0]=clampf(R*v->color.v[0],0,1); + v->color.v[1]=clampf(G*v->color.v[1],0,1); + v->color.v[2]=clampf(B*v->color.v[2],0,1); + v->color.v[3]=clampf(A*v->color.v[3],0,1); }