diff options
| author | Antonioya <blendergit@gmail.com> | 2018-08-03 17:36:53 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-08-03 17:37:07 +0300 |
| commit | 7288d4d8c4a390fb58509120809360a56c00e3cf (patch) | |
| tree | 44fcba81374c162e35ca56858fbddf03e86ffee4 /source/blender/editors/gpencil/gpencil_data.c | |
| parent | fe8dcffd79488451f748a0c9cf33e7ca6579c028 (diff) | |
Replace wrong aasign material flag to BKE_MAT_ASSIGN_USERPREF
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_data.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |