From 7288d4d8c4a390fb58509120809360a56c00e3cf Mon Sep 17 00:00:00 2001 From: Antonioya Date: Fri, 3 Aug 2018 16:36:53 +0200 Subject: Replace wrong aasign material flag to BKE_MAT_ASSIGN_USERPREF --- source/blender/editors/gpencil/gpencil_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/gpencil/gpencil_data.c') diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 8598d45ff01..43721d73a80 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -1903,7 +1903,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op) Material *tmp_ma = (*matar)[i]; if (BKE_object_material_slot_find_index(ob_dst, tmp_ma) == 0) { BKE_object_material_slot_add(bmain, ob_dst); - assign_material(bmain, ob_dst, tmp_ma, ob_dst->totcol, BKE_MAT_ASSIGN_EXISTING); + assign_material(bmain, ob_dst, tmp_ma, ob_dst->totcol, BKE_MAT_ASSIGN_USERPREF); } } -- cgit v1.2.3