[Bf-blender-cvs] [25e151cc347] master: Fix T83575: GPencil: VFX Blur is not disabled when samples are zero
Antonio Vazquez
noreply at git.blender.org
Wed Dec 9 15:41:19 CET 2020
Commit: 25e151cc34715f4f27f2cecad252b02d1498ba15
Author: Antonio Vazquez
Date: Wed Dec 9 15:41:07 2020 +0100
Branches: master
https://developer.blender.org/rB25e151cc34715f4f27f2cecad252b02d1498ba15
Fix T83575: GPencil: VFX Blur is not disabled when samples are zero
Before the number of samples was not checked, only the pixel size.
===================================================================
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 d01aaaed8b0..cb65fbd6ae7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -95,7 +95,7 @@ static DRWShadingGroup *gpencil_vfx_pass_create(const char *name,
static void gpencil_vfx_blur(BlurShaderFxData *fx, Object *ob, gpIterVfxData *iter)
{
- if (fx->radius[0] == 0.0f && fx->radius[1] == 0.0f) {
+ if ((fx->samples == 0.0f) || (fx->radius[0] == 0.0f && fx->radius[1] == 0.0f)) {
return;
}
More information about the Bf-blender-cvs
mailing list