[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47648] branches/soc-2011-tomato/source/ blender/compositor/operations/COM_KeyingClipOperation.cpp: Looks like some kind of merge error happened here which i didn't notice.

[Sergey Sharybin]

Revision: 47648
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47648
Author:   nazgul
Date:     2012-06-09 18:26:26 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Looks like some kind of merge error happened here which i didn't notice. Corrected!

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp	2012-06-09 18:20:40 UTC (rev 47647)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp	2012-06-09 18:26:26 UTC (rev 47648)
@@ -83,13 +83,11 @@
 	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);
 	}
 }