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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-08-21 17:19:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-08-21 17:19:34 +0400
commit63e6fbfbd4b598f79522b98b11ee33dbfd8d041d (patch)
tree15775753d648ea7fb8078e5e40feca4726f00e5d /source/blender/blenkernel/intern/colortools.c
parentbe4ac3a860723af7d176aeabb1dba112a1594bd3 (diff)
Fix #32369: pixel glitch with compositor curves node, and some pixels having
black point = white point. That's a degenerate case, clamped it now to 1e5, which is a bit arbitrary, but infinity would give NaN issues.
Diffstat (limited to 'source/blender/blenkernel/intern/colortools.c')
-rw-r--r--source/blender/blenkernel/intern/colortools.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 4bc22d77ec9..24a84d79935 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -150,13 +150,8 @@ void curvemapping_set_black_white_ex(const float black[3], const float white[3],
int a;
for (a = 0; a < 3; a++) {
- const float delta = white[a] - black[a];
- if (delta != 0.0f) {
- r_bwmul[a] = 1.0f / delta;
- }
- else {
- r_bwmul[a] = 0.0f;
- }
+ const float delta = MAX2(white[a] - black[a], 1e-5f);
+ r_bwmul[a] = 1.0f / delta;
}
}