diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2021-11-23 17:41:09 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2021-11-23 17:41:09 +0300 |
| commit | 2c2b79191f0179b74d76b02e02d91e029d716d41 (patch) | |
| tree | 70d46cdd0e6e397048bdda0f084f67f9d270ff19 | |
| parent | 4b13dcaf027a67af02f307bc720d34a1db2e6a3c (diff) | |
| parent | 1a7c32a0aba5219a97ff96c5269e075b1d3a3fed (diff) | |
Merge branch 'blender-v3.0-release'
| -rw-r--r-- | release/scripts/freestyle/modules/parameter_editor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py index 65eee93c871..ed5b57af689 100644 --- a/release/scripts/freestyle/modules/parameter_editor.py +++ b/release/scripts/freestyle/modules/parameter_editor.py @@ -166,7 +166,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) |