diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-07 14:31:17 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-07 14:31:17 +0300 |
| commit | 1fcc5adc60097d1245ade154986bb67bf9cdb926 (patch) | |
| tree | e77a9e5a961a9f9687a5efdd6b470ff9d25b807c /source/blender/compositor/nodes/COM_TimeNode.cpp | |
| parent | fa7643bc7bf815a61a57a03f6e42371269d4208b (diff) | |
| parent | 5350015d519ec299b9a8937e4e035fe405001d8d (diff) | |
Merge branch 'soc-2019-openxr' into temp-vr-draw-threadtemp-vr-draw-thread
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); |