[Bf-blender-cvs] [5aa2fa4fe0d] greasepencil-object: GPencil: Cleanup code

Antonio Vazquez noreply at git.blender.org
Mon Feb 17 17:24:31 CET 2020


Commit: 5aa2fa4fe0d5e30f817513a50869b93bc3dda45b
Author: Antonio Vazquez
Date:   Mon Feb 17 16:55:05 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5aa2fa4fe0d5e30f817513a50869b93bc3dda45b

GPencil: Cleanup code

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

M	source/blender/draw/engines/gpencil/gpencil_shader_fx.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index a85605e7c4b..b4566fd4a23 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -135,7 +135,7 @@ static void gpencil_vfx_blur(BlurShaderFxData *fx, Object *ob, gpIterVfxData *it
   if (blur_size[1] > 0.0f) {
     grp = gpencil_vfx_pass_create("Fx Blur V", state, iter, sh);
     DRW_shgroup_uniform_vec2_copy(
-        grp, "offset", (float[2]){0.0f - blur_size[1] * s, blur_size[1] * c});
+        grp, "offset", (float[2]){-blur_size[1] * s, blur_size[1] * c});
     DRW_shgroup_uniform_int_copy(grp, "sampCount", max_ii(1, min_ii(fx->samples, blur_size[1])));
     DRW_shgroup_call_procedural_triangles(grp, NULL, 1);
   }
@@ -466,7 +466,7 @@ static void gpencil_vfx_glow(GlowShaderFxData *fx, Object *UNUSED(ob), gpIterVfx
 
   grp = gpencil_vfx_pass_create("Fx Glow V", state, iter, sh);
   DRW_shgroup_uniform_vec2_copy(
-      grp, "offset", (float[2]){0.0f - fx->blur[1] * s, fx->blur[1] * c});
+      grp, "offset", (float[2]){-fx->blur[1] * s, fx->blur[1] * c});
   DRW_shgroup_uniform_vec3_copy(grp, "threshold", ref_col);
   DRW_shgroup_uniform_vec3_copy(grp, "glowColor", (float[3]){1.0f, 1.0f, 1.0f});
   DRW_shgroup_uniform_bool_copy(grp, "glowUnder", (fx->flag & FX_GLOW_USE_ALPHA) != 0);



More information about the Bf-blender-cvs mailing list