Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / nodes / composite / nodes / node_composite_mixrgb.c
index 4a303e911e2a3a463f95ab04701ca2fcec77449f..0296fa417d6dd1f6353b00b8e8ab62228bb02e99 100644 (file)
@@ -49,9 +49,9 @@ static void do_mix_rgb(bNode *node, float *out, float *in1, float *in2, float *f
        
        copy_v3_v3(col, in1);
        if(node->custom2)
-               ramp_blend(node->custom1, col, col+1, col+2, in2[3]*fac[0], in2);
+               ramp_blend(node->custom1, col, in2[3]*fac[0], in2);
        else
-               ramp_blend(node->custom1, col, col+1, col+2, fac[0], in2);
+               ramp_blend(node->custom1, col, fac[0], in2);
        copy_v3_v3(out, col);
        out[3]= in1[3];
 }