Commit: d4a5b6af7680437f8f7aa93fc80b9b4112836494
Author: Antonio Vazquez
Date: Thu Jul 22 10:37:26 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBd4a5b6af7680437f8f7aa93fc80b9b4112836494
GPencil: Avoid segment fault when material is NULL
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 621a6a11194..13a8d4f105f 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2514,7 +2514,7 @@ int BKE_gpencil_object_material_index_get_by_name(Object
*ob, const char *name)
for (short i = 0; i < *totcol; i++) {
read_ma = BKE_object_material_get(ob, i + 1);
/* Material names are like "MAMaterial.001" */
- if (STREQ(name, &read_ma->id.name[2])) {
+ if ((read_ma) && (STREQ(name, &read_ma->id.name[2]))) {
return i;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
