[Bf-blender-cvs] [944a705215f] blender-v2.83-release: Fix T93320: Freestyle LineStyleModifier blend 'Minimum' error

Philipp Oeser noreply at git.blender.org
Mon Jan 17 17:16:48 CET 2022


Commit: 944a705215f48de70001bf106cda8c2932ea0b60
Author: Philipp Oeser
Date:   Tue Nov 23 11:10:33 2021 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rB944a705215f48de70001bf106cda8c2932ea0b60

Fix T93320: Freestyle LineStyleModifier blend 'Minimum' error

This was just a typo in {rBb408d8af31c9}
Must be 'MINIMUM' (instead of 'MININUM').

Maniphest Tasks: T93320

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

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

M	release/scripts/freestyle/modules/parameter_editor.py

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

diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py
index 534ee7d65be..8be10ff7fb3 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -164,7 +164,7 @@ class ScalarBlendModifier(StrokeShader):
             v1 = facm * v1 + fac * v1 / v2 if v2 != 0.0 else v1
         elif self.blend_type == 'DIFFERENCE':
             v1 = facm * v1 + fac * abs(v1 - v2)
-        elif self.blend_type == 'MININUM':
+        elif self.blend_type == 'MINIMUM':
             v1 = min(fac * v2, v1)
         elif self.blend_type == 'MAXIMUM':
             v1 = max(fac * v2, v1)



More information about the Bf-blender-cvs mailing list