[Bf-blender-cvs] [e31a5a4c62b] master: GP: Fix render glitch when have collision with mesh

Antonioya noreply at git.blender.org
Thu Jan 10 16:26:11 CET 2019


Commit: e31a5a4c62bc3903eb037c87c8b261ebfaba8e8f
Author: Antonioya
Date:   Thu Jan 10 16:25:34 2019 +0100
Branches: master
https://developer.blender.org/rBe31a5a4c62bc3903eb037c87c8b261ebfaba8e8f

GP: Fix render glitch when have collision with mesh

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

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

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

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);
+						}
 					}
 				}
 			}



More information about the Bf-blender-cvs mailing list