[Bf-blender-cvs] [f536d5f8219] greasepencil-object: Cleanup: Define variable using #define
Antonio Vazquez
noreply at git.blender.org
Wed Apr 4 16:37:35 CEST 2018
Commit: f536d5f821944bb6bc2ee5ae3cf4fee4d8aac2a2
Author: Antonio Vazquez
Date: Wed Apr 4 16:23:15 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf536d5f821944bb6bc2ee5ae3cf4fee4d8aac2a2
Cleanup: Define variable using #define
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_light_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 a4f6541f33c..f3026c32fc8 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_light_frag.glsl
@@ -16,6 +16,8 @@ out vec4 FragColor;
float defaultpixsize = pixsize * pixelsize * (1000.0 / pixfactor);
+#define height loc.w
+
/* project 3d point to 2d on screen space */
vec2 toScreenSpace(vec4 vertex)
{
@@ -44,7 +46,7 @@ void main()
/* the height over plane is received in the w component of the loc
* and needs a factor to adapt to pixels
*/
- float peak = loc.w * 10.0 * pxscale;
+ float peak = height * 10.0 * pxscale;
vec3 light3d = vec3(light2d.x, light2d.y, peak);
vec2 uv = vec2(gl_FragCoord.xy);
More information about the Bf-blender-cvs
mailing list