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:
authorCampbell Barton <ideasman42@gmail.com>2009-08-01 03:42:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-08-01 03:42:22 +0400
commit0b3fd395ef3c6d9f3a83712abe2903cb661e94eb (patch)
tree5b40726d5a0def595cfbf2b397817b257387c12c /source/blender/nodes
parentfe850bd1637b9d0efd28cfcc648903172d7b9303 (diff)
parent0949d48d25efdb703e7b411b4403f3cdf0eb5308 (diff)
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
index 973d74d71ff..9aebd999b29 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
@@ -53,7 +53,7 @@ static void do_luma_matte(bNode *node, float *out, float *in)
if(in[0]>c->t1) {
alpha=1.0;
}
- else if(in[1]<c->t2){
+ else if(in[0]<c->t2){
alpha=0.0;
}
else {/*blend */
@@ -99,7 +99,7 @@ static void node_composit_init_luma_matte(bNode *node)
{
NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
node->storage=c;
- c->t1= 0.0f;
+ c->t1= 1.0f;
c->t2= 0.0f;
};