[Bf-blender-cvs] [f09fcda8b68] master: Fix T81081: GPencil preset error

Philipp Oeser noreply at git.blender.org
Wed Sep 23 13:30:02 CEST 2020


Commit: f09fcda8b681656b3f7bf8917ecf654a9d30faef
Author: Philipp Oeser
Date:   Wed Sep 23 13:22:34 2020 +0200
Branches: master
https://developer.blender.org/rBf09fcda8b681656b3f7bf8917ecf654a9d30faef

Fix T81081: GPencil preset error

Caused by still having 'texture_opacity' in the preests and the preset
operator (but this was removed in the 2.83 rewrite).

Maniphest Tasks: T81081

Differential Revision: https://developer.blender.org/D8990

===================================================================

M	release/scripts/presets/gpencil_material/fill_only.py
M	release/scripts/presets/gpencil_material/stroke_and_fill.py
M	release/scripts/presets/gpencil_material/stroke_only.py
M	release/scripts/startup/bl_operators/presets.py

===================================================================

diff --git a/release/scripts/presets/gpencil_material/fill_only.py b/release/scripts/presets/gpencil_material/fill_only.py
index 57d5dc3b860..aa4d58a8c10 100644
--- a/release/scripts/presets/gpencil_material/fill_only.py
+++ b/release/scripts/presets/gpencil_material/fill_only.py
@@ -19,7 +19,6 @@ gpcolor.flip = False
 gpcolor.texture_offset = (0.0, 0.0)
 gpcolor.texture_scale = (1.0, 1.0)
 gpcolor.texture_angle = 0.0
-gpcolor.texture_opacity = 1.0
 gpcolor.texture_clamp = False
 gpcolor.mix_factor = 0.0
 gpcolor.show_stroke = False
diff --git a/release/scripts/presets/gpencil_material/stroke_and_fill.py b/release/scripts/presets/gpencil_material/stroke_and_fill.py
index eff728a7857..3572036de5e 100644
--- a/release/scripts/presets/gpencil_material/stroke_and_fill.py
+++ b/release/scripts/presets/gpencil_material/stroke_and_fill.py
@@ -19,7 +19,6 @@ gpcolor.flip = False
 gpcolor.texture_offset = (0.0, 0.0)
 gpcolor.texture_scale = (1.0, 1.0)
 gpcolor.texture_angle = 0.0
-gpcolor.texture_opacity = 1.0
 gpcolor.texture_clamp = False
 gpcolor.mix_factor = 0.0
 gpcolor.show_stroke = True
diff --git a/release/scripts/presets/gpencil_material/stroke_only.py b/release/scripts/presets/gpencil_material/stroke_only.py
index 1724a62bffc..4e02b108e01 100644
--- a/release/scripts/presets/gpencil_material/stroke_only.py
+++ b/release/scripts/presets/gpencil_material/stroke_only.py
@@ -19,7 +19,6 @@ gpcolor.flip = False
 gpcolor.texture_offset = (0.0, 0.0)
 gpcolor.texture_scale = (1.0, 1.0)
 gpcolor.texture_angle = 0.0
-gpcolor.texture_opacity = 1.0
 gpcolor.texture_clamp = False
 gpcolor.mix_factor = 0.0
 gpcolor.show_stroke = True
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 2ea93a1aee9..243fad076cc 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -686,7 +686,6 @@ class AddPresetGpencilMaterial(AddPresetBase, Operator):
         "gpcolor.texture_offset",
         "gpcolor.texture_scale",
         "gpcolor.texture_angle",
-        "gpcolor.texture_opacity",
         "gpcolor.texture_clamp",
         "gpcolor.mix_factor",
         "gpcolor.show_stroke",



More information about the Bf-blender-cvs mailing list