diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-09 22:26:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-09 22:26:26 +0400 |
| commit | a8bae06dc4c7e4181d9ee16ee23866b8eeba56ff (patch) | |
| tree | 194f014eaf3b44447b14dabe979930933fc00c7e /source/blender/compositor/operations/COM_KeyingClipOperation.cpp | |
| parent | 1acd2c58b6ea1bdce3b50385d5955eb4b50b4a93 (diff) | |
Looks like some kind of merge error happened here which i didn't notice. Corrected!
Diffstat (limited to 'source/blender/compositor/operations/COM_KeyingClipOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_KeyingClipOperation.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cpp b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp index 559d282f613..1c92e76c51a 100644 --- a/source/blender/compositor/operations/COM_KeyingClipOperation.cpp +++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp @@ -83,13 +83,11 @@ void KeyingClipOperation::executePixel(float *color, float x, float y, PixelSamp color[0] = pixelColor[0]; if (count_black >= 22 || count_white >= 22) { - if (count_black >= 4 || count_white >= 4) { - if (color[0] < this->clipBlack) - color[0] = 0.0f; - else if (color[0] >= this->clipWhite) - color[0] = 1.0f; - else - color[0] = (color[0] - this->clipBlack) / (this->clipWhite - this->clipBlack); - } + if (color[0] < this->clipBlack) + color[0] = 0.0f; + else if (color[0] >= this->clipWhite) + color[0] = 1.0f; + else + color[0] = (color[0] - this->clipBlack) / (this->clipWhite - this->clipBlack); } } |