[Bf-blender-cvs] [b1035ae3ac7] greasepencil-object: Cleanup code

[Antonio Vazquez]

Commit: b1035ae3ac753ba166dcdeac8669a09e547389c6
Author: Antonio Vazquez
Date:   Fri Nov 24 16:43:57 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb1035ae3ac753ba166dcdeac8669a09e547389c6

Cleanup code

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index e3f47b69adf..e662765a8ac 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -392,11 +392,7 @@ static void GPENCIL_cache_init(void *vedata)
 		DRW_shgroup_call_add(paper_shgrp, paperquad, NULL);
 		DRW_shgroup_uniform_vec4(paper_shgrp, "color", ts->gpencil_paper_color, 1);
 
-		unsigned char gridcolor[3];
-		UI_GetThemeColor3ubv(TH_GRID, gridcolor);
-		stl->storage->gridcolor[0] = (float)gridcolor[0];
-		stl->storage->gridcolor[1] = (float)gridcolor[1];
-		stl->storage->gridcolor[2] = (float)gridcolor[2];
+		UI_GetThemeColor3fv(TH_GRID, stl->storage->gridcolor);
 		DRW_shgroup_uniform_vec3(paper_shgrp, "gridcolor", &stl->storage->gridcolor[0], 1);
 
 		stl->storage->gridsize[0] = (float)ts->gpencil_grid_size[0];
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
index 5ed5c7476f9..a9be35e2707 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
@@ -10,7 +10,7 @@ void main()
 	vec2 uv = vec2(gl_FragCoord.xy);
 	float dx = size[0];
 	float dy = size[1];
-	vec4 gcolor = vec4(gridcolor.r / 255.0,gridcolor.g / 255.0,gridcolor.b / 255.0, 1.0);
+	vec4 gcolor = vec4(gridcolor.r, gridcolor.g, gridcolor.b, 1.0);
 	/* avoid too small grid */
 	if (dx < 15.0) {
 		dx = 15.0;