diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-05 18:14:46 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-05 18:14:46 +0300 |
commit | 84a154ac68d01583b318cca43d8d8bbded127700 (patch) | |
tree | 6414db1d253a5bbf0314a95b1cef47e2ef9da83c /source/blender/compositor | |
parent | ae9beb1cead99ced03798f6acad8082408323991 (diff) | |
parent | df267bd4c48a3b73ad959951419161ae8f9ed126 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/operations/COM_MapRangeOperation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cpp b/source/blender/compositor/operations/COM_MapRangeOperation.cpp index 7a89ba91b4c..7a38d066122 100644 --- a/source/blender/compositor/operations/COM_MapRangeOperation.cpp +++ b/source/blender/compositor/operations/COM_MapRangeOperation.cpp @@ -65,6 +65,11 @@ void MapRangeOperation::executePixelSampled(float output[4], float x, float y, P dest_min = inputs[3]; dest_max = inputs[4]; + if (fabsf(source_max - source_min) < 1e-6f) { + output[0] = 0.0f; + return; + } + if (value >= -BLENDER_ZMAX && value <= BLENDER_ZMAX) { value = (value - source_min) / (source_max - source_min); value = dest_min + value * (dest_max - dest_min); |