Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-30 16:48:30 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-30 16:48:30 +0400
commit4f8f5746a8f3a72d54dab44a2b30d2d144891b77 (patch)
tree98fbd6df3b481a8611dd6ae97c40db138d3d67b6 /source/blender/compositor
parent1db677a51cfb13a7f6df81a2799e2bb506145d3b (diff)
Normalize node: clamp infinities to 0/1 (depending on sign)
The same behavior was in old compositor system and it makes more sense when you're normalizing Z buffer.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_NormalizeOperation.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cpp b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
index 5f7ac6bb9ca..f81b50e6836 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cpp
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
@@ -43,6 +43,12 @@ void NormalizeOperation::executePixel(float output[4], int x, int y, void *data)
this->m_imageReader->read(output, x, y, NULL);
output[0] = (output[0] - minmult->x) * minmult->y;
+
+ /* clamp infinities */
+ if (output[0] > 1.0f)
+ output[0] = 1.0f;
+ else if (output[0] < 0.0f)
+ output[0] = 0.0f;
}
void NormalizeOperation::deinitExecution()