Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / render / intern / source / render_texture.c
index 277ef90b9abc79b230ae7909687e7de75a7602da..9459745cdbcdab3391dc51e8e5153da0bc048af7 100644 (file)
@@ -1484,32 +1484,32 @@ void texture_rgb_blend(float in[3], const float tex[3], const float out[3], floa
        case MTEX_BLEND_HUE:
                fact*= facg;
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_HUE, in, in+1, in+2, fact, tex);
+               ramp_blend(MA_RAMP_HUE, in, fact, tex);
                break;
        case MTEX_BLEND_SAT:
                fact*= facg;
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_SAT, in, in+1, in+2, fact, tex);
+               ramp_blend(MA_RAMP_SAT, in, fact, tex);
                break;
        case MTEX_BLEND_VAL:
                fact*= facg;
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_VAL, in, in+1, in+2, fact, tex);
+               ramp_blend(MA_RAMP_VAL, in, fact, tex);
                break;
        case MTEX_BLEND_COLOR:
                fact*= facg;
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_COLOR, in, in+1, in+2, fact, tex);
+               ramp_blend(MA_RAMP_COLOR, in, fact, tex);
                break;
        case MTEX_SOFT_LIGHT: 
                fact*= facg; 
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_SOFT, in, in+1, in+2, fact, tex); 
+               ramp_blend(MA_RAMP_SOFT, in, fact, tex);
                break; 
        case MTEX_LIN_LIGHT: 
                fact*= facg; 
                copy_v3_v3(in, out);
-               ramp_blend(MA_RAMP_LINEAR, in, in+1, in+2, fact, tex); 
+               ramp_blend(MA_RAMP_LINEAR, in, fact, tex);
                break; 
        }
 }