diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
| commit | 43ce201125ff97e16a56b372a91442590498dacc (patch) | |
| tree | 10b6ef3c41cab5b9cef0b93d99de0a14fca4157f /source/blender/compositor/nodes | |
| parent | 75188552a113f4dc226f21076f883ac3c11c9a98 (diff) | |
| parent | 42103a3eb8e9ee341c89310cc2343bc21b6ae7e2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_TimeNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 8450b521267..0185b85e772 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -54,7 +54,7 @@ void TimeNode::convertToOperations(NodeConverter &converter, const CompositorCon curvemapping_initialize((CurveMapping *)node->storage); fac = curvemapping_evaluateF((CurveMapping *)node->storage, 0, fac); - operation->setValue(CLAMPIS(fac, 0.0f, 1.0f)); + operation->setValue(clamp_f(fac, 0.0f, 1.0f)); converter.addOperation(operation); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); |