Revision: 47646
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47646
Author: nazgul
Date: 2012-06-09 18:19:41 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Actually that was an error in on of test formulas. Stick back to original one.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
2012-06-09 17:45:22 UTC (rev 47645)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
2012-06-09 18:19:41 UTC (rev 47646)
@@ -49,12 +49,7 @@
float max = MAX2(pixelColor[other_1], pixelColor[other_2]);
float val = screen_balance * min + (1.0f - screen_balance) * max;
- // original formula, also used by brecht
- // works a bit crappy in areas with values > 1.0
- // return (pixelColor[primary_channel] - val) * fabsf(1.0f - val);
-
- // sergey's test formula
- return pixelColor[1] - (pixelColor[0] + pixelColor[1]) * 0.5f;
+ return (pixelColor[primary_channel] - val) * fabsf(1.0f - val);
}
KeyingOperation::KeyingOperation(): NodeOperation()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
