[Bf-blender-cvs] [b379f02f202] master: Fix T50039: texture paint soften strength not working with float images.

[Brecht Van Lommel]

Commit: b379f02f202a990da19df716242edbdc4fa065d3
Author: Brecht Van Lommel
Date:   Mon Jul 24 15:02:39 2017 +0200
Branches: master
https://developer.blender.org/rBb379f02f202a990da19df716242edbdc4fa065d3

Fix T50039: texture paint soften strength not working with float images.

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 162658f01bb..8586eb42bec 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4295,7 +4295,7 @@ static void do_projectpaint_soften_f(ProjPaintState *ps, ProjPixel *projPixel, f
 				return;
 		}
 		else {
-			blend_color_interpolate_float(rgba, rgba, projPixel->pixel.f_pt, mask);
+			blend_color_interpolate_float(rgba, projPixel->pixel.f_pt, rgba, mask);
 		}
 
 		BLI_linklist_prepend_arena(softenPixels, (void *)projPixel, softenArena);