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/gpencil_modifiers | |
parent | fe8dcffd79488451f748a0c9cf33e7ca6579c028 (diff) |
Replace wrong aasign material flag to BKE_MAT_ASSIGN_USERPREF
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | 2 | ||||
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 3cd298e9b87..88754f29db3 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -126,7 +126,7 @@ static void bakeModifier( if (newmat == NULL) { BKE_object_material_slot_add(bmain, ob); newmat = BKE_material_copy(bmain, mat); - assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_EXISTING); + assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF); copy_v4_v4(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba); copy_v4_v4(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 859e12adfb5..641a75bc353 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -134,7 +134,7 @@ static void bakeModifier( if (newmat == NULL) { BKE_object_material_slot_add(bmain, ob); newmat = BKE_material_copy(bmain, mat); - assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_EXISTING); + assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF); copy_v4_v4(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba); copy_v4_v4(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba); |