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:
authorAntony Riakiotakis <kalast@gmail.com>2014-08-29 19:18:06 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-08-29 19:18:06 +0400
commitbfd466f34c12c1998759a17e684c1bc2f747665e (patch)
tree99c72b6112bcb0d1ec7c00c9ef0be7e7537dfc9d
parent78b79a91f2aea012c6ba9181ac3c32aeb66d392c (diff)
Fix wrong result with sharpen brush on float images in projective
painting.
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_proj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index fbe0a6942e7..a6cbe1f92b2 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;