Fix T63897: GPencil Material Presets showing error master
authorAntonioya <blendergit@gmail.com>
Fri, 26 Apr 2019 08:14:50 +0000 (10:14 +0200)
committerAntonioya <blendergit@gmail.com>
Fri, 26 Apr 2019 08:14:50 +0000 (10:14 +0200)
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
release/scripts/presets/gpencil_material/stroke_and_fill.py
release/scripts/presets/gpencil_material/stroke_only.py
release/scripts/startup/bl_operators/presets.py

index b15f5f2..bad9d7b 100644 (file)
@@ -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
index b9a1e87..1f52394 100644 (file)
@@ -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
index 96739af..27b579f 100644 (file)
@@ -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
index baacb0c..c7f516f 100644 (file)
@@ -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",