Commit: 5e61fd7c232ac2ece94c57ca74bebd2c91102f13
Author: Sergey Sharybin
Date: Sun Nov 18 15:56:14 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5e61fd7c232ac2ece94c57ca74bebd2c91102f13
Fix T57896: Crash updating grease pencil material preview
===================================================================
M source/blender/blenkernel/intern/material.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index 0e64b9dd6d0..6741ebf39d2 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -244,7 +244,10 @@ Material *BKE_material_localize(Material *ma)
man->nodetree = ntreeLocalize(ma->nodetree);
}
- /* man->gp_style = NULL; */ /* XXX: We probably don't want to clear
here, or else we may get problems with COW later? */
+ if (ma->gp_style != NULL) {
+ man->gp_style = MEM_dupallocN(ma->gp_style);
+ }
+
BLI_listbase_clear(&man->gpumaterial);
/* TODO Duplicate Engine Settings and set runtime to NULL */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
