diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-09-01 10:31:20 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-09-01 10:31:20 +0300 |
| commit | ae43b1d51b4a0384c2197a6aca5cd2810c9283ff (patch) | |
| tree | 29697b8de5c70403326d9fc32fc3a789e19b28d0 /source | |
| parent | 883706395ee37188900e3ac2c00070c9a43246d2 (diff) | |
Fix T69364: GPencil Array Modifiers causes crash
This bug was introduced when adding the support for default materials.
Diffstat (limited to 'source')
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 5209313f717..b44965707d8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -88,7 +88,7 @@ bool is_stroke_affected_by_modifier(Object *ob, bool inv3, bool inv4) { - Material *ma = give_current_material(ob, gps->mat_nr + 1); + Material *ma = BKE_material_gpencil_get(ob, gps->mat_nr + 1); MaterialGPencilStyle *gp_style = ma->gp_style; /* omit if filter by layer */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 741acfbe405..cb429b874a2 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 = give_current_material(ob, gps->mat_nr + 1); + Material *mat = BKE_material_gpencil_get(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 346d1e834a6..c2ab672b68b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -137,7 +137,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 = give_current_material(ob, gps->mat_nr + 1); + Material *mat = BKE_material_gpencil_get(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 bfb2c62cef6..f6ddcf89bcf 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 = give_current_material(ob, gps->mat_nr + 1); + Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1); if (mat == NULL) { continue; } |