diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
| commit | b9898ebde44d6584ea37a05aaeca8760d31ccc7b (patch) | |
| tree | e6dfc796cc82b4b8b8c248c4ff29d2e2047ff84c /source/blender/compositor/nodes/COM_TimeNode.cpp | |
| parent | b17380971a144896b34b7863a82bbda3ff68a39f (diff) | |
| parent | 553b581f25c1782c4231816965cd3f6ce58a449a (diff) | |
Merge branch 'master' into filebrowser_redesign
Diffstat (limited to 'source/blender/compositor/nodes/COM_TimeNode.cpp')
| -rw-r--r-- | source/blender/compositor/nodes/COM_TimeNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 45604882992..2a30ee9c574 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -49,8 +49,8 @@ void TimeNode::convertToOperations(NodeConverter &converter, fac = (context.getFramenumber() - node->custom1) / (float)(node->custom2 - node->custom1); } - curvemapping_initialize((CurveMapping *)node->storage); - fac = curvemapping_evaluateF((CurveMapping *)node->storage, 0, fac); + BKE_curvemapping_initialize((CurveMapping *)node->storage); + fac = BKE_curvemapping_evaluateF((CurveMapping *)node->storage, 0, fac); operation->setValue(clamp_f(fac, 0.0f, 1.0f)); converter.addOperation(operation); |