Commit: bfd466f34c12c1998759a17e684c1bc2f747665e
Author: Antony Riakiotakis
Date:   Fri Aug 29 17:18:06 2014 +0200
Branches: master
https://developer.blender.org/rBbfd466f34c12c1998759a17e684c1bc2f747665e

Fix wrong result with sharpen brush on float images in projective
painting.

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

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 fbe0a69..a6cbe1f 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -3787,7 +3787,7 @@ static void do_projectpaint_smear_f(ProjPaintState *ps, 
ProjPixel *projPixel, fl
 static void do_projectpaint_soften_f(ProjPaintState *ps, ProjPixel *projPixel, 
float mask,
                                      MemArena *softenArena, LinkNode 
**softenPixels)
 {
-       float accum_tot = 0.0;
+       float accum_tot = 0.0f;
        int xk, yk;
        BlurKernel *kernel = ps->blurkernel;
        float *rgba = projPixel->newColor.f;
@@ -3827,7 +3827,7 @@ static void do_projectpaint_soften_f(ProjPaintState *ps, 
ProjPixel *projPixel, f
 
                                /* add to enhance edges */
                                blend_color_add_float(rgba, 
projPixel->pixel.f_pt, rgba);
-                               projPixel->pixel.f_pt[3] = alpha;
+                               rgba[3] = alpha;
                        }
                        else
                                return;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to