Replace wrong aasign material flag to BKE_MAT_ASSIGN_USERPREF

5 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 8a7128adde1..b0c3675c123 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -68,7 +68,7 @@ static int gpencil_monkey_color(Main *bmain, Object *ob, const ColorTemplate *pc
 	/* create a new one */
 	BKE_object_material_slot_add(bmain, ob);
 	ma = BKE_material_add_gpencil(bmain, pct->name);
-	assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_EXISTING);
+	assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
 
 	copy_v4_v4(ma->gp_style->stroke_rgba, pct->line);
 	copy_v4_v4(ma->gp_style->fill_rgba, pct->fill);
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);
 					}
 				}
 
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 789917780a0..969ff326c61 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -734,7 +734,7 @@ GHash *gp_copybuf_validate_colormap(bContext *C)
 
 		if (BKE_object_material_slot_find_index(ob, ma) == 0) {
 			BKE_object_material_slot_add(bmain, ob);
-			assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_EXISTING);
+			assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
 		}
 
 		/* Store this mapping (for use later when pasting) */
@@ -3195,7 +3195,7 @@ static int gp_stroke_separate_exec(bContext *C, wmOperator *op)
 									BKE_object_material_slot_add(bmain, ob_dst);
 								}
 
-								assign_material(bmain, ob_dst, ma, ob_dst->totcol, BKE_MAT_ASSIGN_EXISTING);
+								assign_material(bmain, ob_dst, ma, ob_dst->totcol, BKE_MAT_ASSIGN_USERPREF);
 								idx = totadd;
 							}
 
diff --git a/source/blender/editors/gpencil/gpencil_old.c b/source/blender/editors/gpencil/gpencil_old.c
index b7af1c80d4c..76d519fe371 100644
--- a/source/blender/editors/gpencil/gpencil_old.c
+++ b/source/blender/editors/gpencil/gpencil_old.c
@@ -129,7 +129,7 @@ static int gpencil_convert_old_files_exec(bContext *C, wmOperator *UNUSED(op))
 				/* create material slot */
 				BKE_object_material_slot_add(bmain, ob);
 				Material *ma = BKE_material_add_gpencil(bmain, palcolor->info);
-				assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_EXISTING);
+				assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
 
 				/* copy color settings */
 				MaterialGPencilStyle *gp_style = ma->gp_style;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 6a0bf0c4a47..88f90d6c128 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1604,7 +1604,7 @@ static void gp_init_colors(tGPsdata *p)
 	/* check if the material is already on object material slots and add it if missing */
 	if (BKE_object_material_slot_find_index(p->ob, p->material) == 0) {
 		BKE_object_material_slot_add(p->bmain, p->ob);
-		assign_material(p->bmain, p->ob, ma, p->ob->totcol, BKE_MAT_ASSIGN_EXISTING);
+		assign_material(p->bmain, p->ob, ma, p->ob->totcol, BKE_MAT_ASSIGN_USERPREF);
 	}
 
 	/* assign color information to temp tGPsdata */