[Bf-blender-cvs] [c4f5477decc] greasepencil-object: Fix error when blend layers are consecutive

Antonioya noreply at git.blender.org
Sat Nov 24 12:44:49 CET 2018


Commit: c4f5477decce54c9d77586ef4bdb0e32266b36f9
Author: Antonioya
Date:   Sat Nov 24 12:44:40 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc4f5477decce54c9d77586ef4bdb0e32266b36f9

Fix error when blend layers are consecutive

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 647b20bd200..901d1c3c00f 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -773,7 +773,8 @@ void GPENCIL_draw_scene(void *ved)
 				if (cache_ob->tot_layers > 0) {
 					for (int e = 0; e < cache_ob->tot_layers; e++) {
 						array_elm = &cache_ob->shgrp_array[e];
-						if (init_shgrp == NULL) {
+						if ((array_elm->mode == eGplBlendMode_Normal) && (init_shgrp == NULL))
+						{
 							init_shgrp = array_elm->init_shgrp;
 							end_shgrp = array_elm->end_shgrp;
 						}



More information about the Bf-blender-cvs mailing list