[Bf-blender-cvs] [da8febb319f] master: Fix T59527: Segment fault changing layer visibility and onion skin

Antonioya noreply at git.blender.org
Thu Jan 3 10:40:04 CET 2019


Commit: da8febb319ff37f20612add7ebc7cc667b81ab4d
Author: Antonioya
Date:   Thu Jan 3 10:39:14 2019 +0100
Branches: master
https://developer.blender.org/rBda8febb319ff37f20612add7ebc7cc667b81ab4d

Fix T59527: Segment fault changing layer visibility and onion skin

In some situation when the layer is hidden, the onion skin must be disabled too, because the material is not available.

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 1275e93744e..fa16a00183e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -872,6 +872,9 @@ static void gpencil_draw_onion_strokes(
 
 	for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 		MaterialGPencilStyle *gp_style = BKE_material_gpencil_settings_get(ob, gps->mat_nr + 1);
+		if (gp_style == NULL) {
+			continue;
+		}
 		copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba);
 		copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba);



More information about the Bf-blender-cvs mailing list