Commit: aa342de7c03236022a213b8dc8d9029f53db3930
Author: Antonio Vazquez
Date: Wed Feb 28 14:18:46 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBaa342de7c03236022a213b8dc8d9029f53db3930
Cleanup: Remove typo error
Thanks to Nikola Ivanov for catch the error.
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
M source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
M source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
M source/blender/draw/engines/gpencil/shaders/gpencil_swirl_frag.glsl
===================================================================
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 0650fbd7d46..a4f6541f33c 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
@@ -14,7 +14,7 @@ uniform float pixfactor;
out vec4 FragColor;
-float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);;
+float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);
/* project 3d point to 2d on screen space */
vec2 toScreenSpace(vec4 vertex)
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
index 15e0b36d401..5cc5602b2c3 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
@@ -18,7 +18,7 @@ out vec2 finaluvdata;
#define TRUE 1
-float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);;
+float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);
void main()
{
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
index f4c3f1502f9..0d18283b241 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
@@ -18,7 +18,7 @@ out vec2 finaluvdata;
#define TRUE 1
-float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);;
+float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);
void main(void)
{
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_swirl_frag.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_swirl_frag.glsl
index b676ee3a214..8664d600d3a 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_swirl_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_swirl_frag.glsl
@@ -16,7 +16,7 @@ uniform float pixfactor;
out vec4 FragColor;
-float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);;
+float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);
/* project 3d point to 2d on screen space */
vec2 toScreenSpace(vec4 vertex)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs