[Bf-blender-cvs] [2e39a27e3b6] blender2.8: Eevee: Fix light color being non-linear.

[Clément Foucault]

Commit: 2e39a27e3b6d72c6697cc2ede56f6566a8e2f221
Author: Clément Foucault
Date:   Thu May 11 14:32:03 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2e39a27e3b6d72c6697cc2ede56f6566a8e2f221

Eevee: Fix light color being non-linear.

===================================================================

M	source/blender/draw/engines/eevee/eevee_lights.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index d34515495c2..15f0b6e99b2 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -190,9 +190,7 @@ static void eevee_light_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngi
 	copy_v3_v3(evli->position, ob->obmat[3]);
 
 	/* Color */
-	evli->color[0] = la->r * la->energy;
-	evli->color[1] = la->g * la->energy;
-	evli->color[2] = la->b * la->energy;
+	srgb_to_linearrgb_v3_v3(evli->color, &la->r);
 
 	/* Influence Radius */
 	evli->dist = la->dist;
@@ -245,7 +243,7 @@ static void eevee_light_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngi
 	else {
 		power = 1.0f;
 	}
-	mul_v3_fl(evli->color, power);
+	mul_v3_fl(evli->color, power * la->energy);
 
 	/* Lamp Type */
 	evli->lamptype = (float)la->type;