diff options
Diffstat (limited to 'source/blender/gpencil_modifiers/intern')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 16e585705df..5069a9aa1cb 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -89,7 +89,7 @@ bool is_stroke_affected_by_modifier(Object *ob, const bool inv3, const bool inv4) { - Material *ma = BKE_material_gpencil_get(ob, gps->mat_nr + 1); + Material *ma = BKE_gpencil_material(ob, gps->mat_nr + 1); MaterialGPencilStyle *gp_style = ma->gp_style; /* omit if filter by layer */ @@ -201,7 +201,7 @@ void gpencil_apply_modifier_material( newmat = BKE_material_copy(bmain, mat); newmat->preview = NULL; - assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF); + BKE_object_material_assign(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_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index cbe2d9a4c4f..d9869c92e06 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -119,7 +119,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { - Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1); + Material *mat = BKE_gpencil_material(ob, gps->mat_nr + 1); if (mat == NULL) { continue; } diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index c0892a1d91a..b0fab5e8d69 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -155,7 +155,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { - Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1); + Material *mat = BKE_gpencil_material(ob, gps->mat_nr + 1); if (mat == NULL) { continue; } diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index f03bc489521..8f3956276dd 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -125,7 +125,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { - Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1); + Material *mat = BKE_gpencil_material(ob, gps->mat_nr + 1); if (mat == NULL) { continue; } |