[Bf-blender-cvs] [2406b8b8d07] greasepencil-object: Verify pointer before assign material

[Antonio Vazquez]

Commit: 2406b8b8d07459475bb71f297892d85767642e1c
Author: Antonio Vazquez
Date:   Fri May 18 18:41:52 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2406b8b8d07459475bb71f297892d85767642e1c

Verify pointer before assign material

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

M	source/blender/blenkernel/intern/gpencil.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 049015a0702..8f2314e1737 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1040,7 +1040,9 @@ Material *BKE_gpencil_get_material_from_brush(Brush *brush)
 {
 	Material *ma = NULL;
 		
-	if ((brush != NULL) && (brush->gpencil_settings->material != NULL)) {
+	if ((brush != NULL) && (brush->gpencil_settings != NULL) && 
+		(brush->gpencil_settings->material != NULL)) 
+	{
 		ma = brush->gpencil_settings->material;
 	}