diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
| commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
| tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /source/blender/freestyle | |
| parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
| parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) | |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/intern/python/BPy_Freestyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index 367ad556d02..a6512a64776 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -266,8 +266,8 @@ static PyObject *Freestyle_evaluateCurveMappingF(PyObject * /*self*/, PyObject * cumap = (CurveMapping *)py_srna->ptr.data; BKE_curvemapping_initialize(cumap); /* disable extrapolation if enabled */ - if ((cumap->cm[cur].flag & CUMA_EXTEND_EXTRAPOLATE)) { - cumap->cm[cur].flag &= ~(CUMA_EXTEND_EXTRAPOLATE); + if ((cumap->flag & CUMA_EXTEND_EXTRAPOLATE)) { + cumap->flag &= ~(CUMA_EXTEND_EXTRAPOLATE); BKE_curvemapping_changed(cumap, 0); } return PyFloat_FromDouble(BKE_curvemapping_evaluateF(cumap, cur, value)); |