applied patch from Henning Makholm <henning@makholm.net> that fixes wrong

2002-06-08  Sven Neumann  <sven@gimp.org>

	* app/paint/gimppaintcore.c (gimp_paint_core_get_brush_mask): applied
	patch from Henning Makholm <henning@makholm.net> that fixes wrong
	brush opacity (bug #84538).
This commit is contained in:
Sven Neumann 2002-06-08 00:01:17 +00:00 committed by Sven Neumann
parent 4706b866a1
commit 928cc6429a
2 changed files with 21 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2002-06-08 Sven Neumann <sven@gimp.org>
* app/paint/gimppaintcore.c (gimp_paint_core_get_brush_mask): applied
patch from Henning Makholm <henning@makholm.net> that fixes wrong
brush opacity (bug #84538).
2002-06-08 Sven Neumann <sven@gimp.org>
* plug-ins/common/animationplay.c: ported to the GTK+-2.0 API.

View File

@ -1203,15 +1203,10 @@ gimp_paint_core_get_brush_mask (GimpPaintCore *core,
{
MaskBuf *mask;
if (! core->use_pressure)
{
mask = core->brush->mask;
}
if (core->use_pressure)
mask = gimp_paint_core_scale_mask (core, core->brush->mask, scale);
else
{
mask = gimp_paint_core_scale_mask (core, core->brush->mask,
scale);
}
mask = core->brush->mask;
switch (brush_hardness)
{
@ -1220,15 +1215,23 @@ gimp_paint_core_get_brush_mask (GimpPaintCore *core,
core->cur_coords.x,
core->cur_coords.y);
break;
case GIMP_BRUSH_HARD:
mask = gimp_paint_core_solidify_mask (core, mask);
break;
case GIMP_BRUSH_PRESSURE:
mask = gimp_paint_core_pressurize_mask (core, mask,
core->cur_coords.x,
core->cur_coords.y,
core->cur_coords.pressure);
if (core->use_pressure)
mask = gimp_paint_core_pressurize_mask (core, mask,
core->cur_coords.x,
core->cur_coords.y,
core->cur_coords.pressure);
else
mask = gimp_paint_core_subsample_mask (core, mask,
core->cur_coords.x,
core->cur_coords.y);
break;
default:
break;
}