Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2019-01-10 18:25:34 +0300
committerAntonioya <blendergit@gmail.com>2019-01-10 18:26:05 +0300
commite31a5a4c62bc3903eb037c87c8b261ebfaba8e8f (patch)
treed5be4bdda281265749ff209d067d6c9212627297 /source/blender/draw/engines/gpencil/gpencil_render.c
parent0f1775205ecfee9de21053eb1d187bfa641ba6aa (diff)
GP: Fix render glitch when have collision with mesh
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_render.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_render.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c
index 1fe008e4d44..9a1ac56324f 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.c
+++ b/source/blender/draw/engines/gpencil/gpencil_render.c
@@ -338,7 +338,12 @@ void GPENCIL_render_to_image(void *vedata, RenderEngine *engine, struct RenderLa
}
else {
/* blend gp render */
- blend_pixel(tmp, gp_pixel_rgba);
+ if (tmp[3] < 1.0f) {
+ blend_pixel(tmp, gp_pixel_rgba);
+ }
+ else {
+ copy_v4_v4(gp_pixel_rgba, tmp);
+ }
}
}
}