[Bf-blender-cvs] [8bab8655393] master: Fix T72289: FreeStyle python error

Jeroen Bakker noreply at git.blender.org
Wed Dec 18 11:01:16 CET 2019


Commit: 8bab8655393faf51a2a7ee3b267a745b38fc49e5
Author: Jeroen Bakker
Date:   Tue Dec 17 12:38:12 2019 +0100
Branches: master
https://developer.blender.org/rB8bab8655393faf51a2a7ee3b267a745b38fc49e5

Fix T72289: FreeStyle python error

Introduced by {T67981}. We changed the python API for curve evaluation.
Freestyle still used the old call that failed. This patch updates
FreeStyle to use the new API. I checked other areas in freestyle but it
seemed to be the only `evaluate` for curves that is called directly.

Reviewed By: zeddb

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

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

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 e74b61ced94..534ee7d65be 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -188,7 +188,7 @@ class CurveMappingModifier(ScalarBlendModifier):
         # deprecated: return evaluateCurveMappingF(self.curve, 0, t)
         curve = self.curve
         curve.initialize()
-        result = curve.curves[0].evaluate(t)
+        result = curve.evaluate(curve=curve.curves[0], position=t)
         # float precision errors in t can give a very weird result for evaluate.
         # therefore, bound the result by the curve's min and max values
         return bound(curve.clip_min_y, result, curve.clip_max_y)



More information about the Bf-blender-cvs mailing list