[Bf-blender-cvs] [ca69d500312] greasepencil-object: Cleanup: Check pointer before link

[Antonio Vazquez]

Commit: ca69d5003125ef00090ce7581944310ebc1cbfa6
Author: Antonio Vazquez
Date:   Fri May 18 18:39:25 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBca69d5003125ef00090ce7581944310ebc1cbfa6

Cleanup: Check pointer before link

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

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

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

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index c3bb9ae0914..9b1332b1d70 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -751,7 +751,9 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 				CALLBACK_INVOKE(brush->toggle_brush, IDWALK_CB_NOP);
 				CALLBACK_INVOKE(brush->clone.image, IDWALK_CB_NOP);
 				CALLBACK_INVOKE(brush->paint_curve, IDWALK_CB_USER);
-			    CALLBACK_INVOKE(brush->gpencil_settings->material, IDWALK_CB_USER);
+				if (brush->gpencil_settings) {
+					CALLBACK_INVOKE(brush->gpencil_settings->material, IDWALK_CB_USER);
+				}
 				library_foreach_mtex(&data, &brush->mtex);
 				library_foreach_mtex(&data, &brush->mask_mtex);
 				break;