From 7440f98f980b203d73c047e6aefc144495b4c3c6 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Fri, 26 Apr 2019 10:14:50 +0200 Subject: [PATCH] Fix T63897: GPencil Material Presets showing error This error was introduced in a previous commit with the rename of the parameter. Also added some missing values. --- release/scripts/presets/gpencil_material/fill_only.py | 5 ++++- release/scripts/presets/gpencil_material/stroke_and_fill.py | 5 ++++- release/scripts/presets/gpencil_material/stroke_only.py | 5 ++++- release/scripts/startup/bl_operators/presets.py | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/release/scripts/presets/gpencil_material/fill_only.py b/release/scripts/presets/gpencil_material/fill_only.py index b15f5f28f80..bad9d7b1304 100644 --- a/release/scripts/presets/gpencil_material/fill_only.py +++ b/release/scripts/presets/gpencil_material/fill_only.py @@ -8,6 +8,9 @@ gpcolor.color = (0.0, 0.0, 0.0, 0.0) gpcolor.stroke_image = None gpcolor.pixel_size = 100.0 gpcolor.use_stroke_pattern = False +gpcolor.use_stroke_texture_mix = False +gpcolor.mix_stroke_factor = 0.0 +gpcolor.use_follow_path = True gpcolor.fill_style = 'SOLID' gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) gpcolor.fill_image = None @@ -26,7 +29,7 @@ gpcolor.texture_scale = (1.0, 1.0) gpcolor.texture_angle = 0.0 gpcolor.texture_opacity = 1.0 gpcolor.texture_clamp = False -gpcolor.texture_mix = False +gpcolor.use_fill_texture_mix = False gpcolor.mix_factor = 0.0 gpcolor.show_stroke = False gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/stroke_and_fill.py b/release/scripts/presets/gpencil_material/stroke_and_fill.py index b9a1e873ea2..1f523949a5d 100644 --- a/release/scripts/presets/gpencil_material/stroke_and_fill.py +++ b/release/scripts/presets/gpencil_material/stroke_and_fill.py @@ -8,6 +8,9 @@ gpcolor.color = (0.0, 0.0, 0.0, 1.0) gpcolor.stroke_image = None gpcolor.pixel_size = 100.0 gpcolor.use_stroke_pattern = False +gpcolor.use_stroke_texture_mix = False +gpcolor.mix_stroke_factor = 0.0 +gpcolor.use_follow_path = True gpcolor.fill_style = 'SOLID' gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) gpcolor.fill_image = None @@ -26,7 +29,7 @@ gpcolor.texture_scale = (1.0, 1.0) gpcolor.texture_angle = 0.0 gpcolor.texture_opacity = 1.0 gpcolor.texture_clamp = False -gpcolor.texture_mix = False +gpcolor.use_fill_texture_mix = False gpcolor.mix_factor = 0.0 gpcolor.show_stroke = True gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/stroke_only.py b/release/scripts/presets/gpencil_material/stroke_only.py index 96739af59f0..27b579fce0c 100644 --- a/release/scripts/presets/gpencil_material/stroke_only.py +++ b/release/scripts/presets/gpencil_material/stroke_only.py @@ -8,6 +8,9 @@ gpcolor.color = (0.0, 0.0, 0.0, 1.0) gpcolor.stroke_image = None gpcolor.pixel_size = 100.0 gpcolor.use_stroke_pattern = False +gpcolor.use_stroke_texture_mix = False +gpcolor.mix_stroke_factor = 0.0 +gpcolor.use_follow_path = True gpcolor.fill_style = 'SOLID' gpcolor.fill_color = (0.5, 0.5, 0.5, 0.0) gpcolor.fill_image = None @@ -26,7 +29,7 @@ gpcolor.texture_scale = (1.0, 1.0) gpcolor.texture_angle = 0.0 gpcolor.texture_opacity = 1.0 gpcolor.texture_clamp = False -gpcolor.texture_mix = False +gpcolor.use_fill_texture_mix = False gpcolor.mix_factor = 0.0 gpcolor.show_stroke = True gpcolor.show_fill = False diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index baacb0c051e..c7f516f61a1 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -670,6 +670,9 @@ class AddPresetGpencilMaterial(AddPresetBase, Operator): "gpcolor.stroke_image", "gpcolor.pixel_size", "gpcolor.use_stroke_pattern", + "gpcolor.use_stroke_texture_mix", + "gpcolor.mix_stroke_factor", + "gpcolor.use_follow_path", "gpcolor.fill_style", "gpcolor.fill_color", "gpcolor.fill_image", @@ -688,7 +691,7 @@ class AddPresetGpencilMaterial(AddPresetBase, Operator): "gpcolor.texture_angle", "gpcolor.texture_opacity", "gpcolor.texture_clamp", - "gpcolor.texture_mix", + "gpcolor.use_fill_texture_mix", "gpcolor.mix_factor", "gpcolor.show_stroke", "gpcolor.show_fill",