[Bf-blender-cvs] [ac102ff163a] greasepencil-object: Change Energy scale * 100

[Antonio Vazquez]

Commit: ac102ff163acb4d22f0f2b2cc62320ebed82f548
Author: Antonio Vazquez
Date:   Fri Dec 8 19:48:21 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBac102ff163acb4d22f0f2b2cc62320ebed82f548

Change Energy scale * 100

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
M	source/blender/modifiers/intern/MOD_gpencillight.c

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
index 487f5648769..d867041af95 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
@@ -59,7 +59,7 @@ void main()
 	vec3 lightdir = normalize(light3d - frag_loc);
 	float diff = max(dot(norm, lightdir), 0.0);
 	float dist  = length(light3d - frag_loc) / pxscale;
-	float factor = diff * (energy / (dist * dist));	
+	float factor = diff * ((energy * 100.0) / (dist * dist));	
 	
     vec3 result = factor * max(ambient, 0.1) * vec3(objcolor);
 	
diff --git a/source/blender/modifiers/intern/MOD_gpencillight.c b/source/blender/modifiers/intern/MOD_gpencillight.c
index 008182947ab..7d6bed9e0bf 100644
--- a/source/blender/modifiers/intern/MOD_gpencillight.c
+++ b/source/blender/modifiers/intern/MOD_gpencillight.c
@@ -48,7 +48,7 @@ static void initData(ModifierData *md)
 {
 	GpencilLightModifierData *gpmd = (GpencilLightModifierData *)md;
 	ARRAY_SET_ITEMS(gpmd->loc, 0.0f, 0.0f, 2.0f);
-	gpmd->energy = 1000.0f;
+	gpmd->energy = 10.0f;
 	gpmd->ambient = 5.0f;
 	gpmd->object = NULL;
 }