Commit 5bb9eb7f authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

revert change below.

2007-10-21  Michael Natterer  <mitch@gimp.org>

	* app/dialogs/fade-dialog.c (fade_dialog_new): revert change below.

	* app/paint-funcs/paint-funcs.c (replace_inten_pixels): also honor
	the passed opacity when there is no mask. Fixes blending in
	replace mode then where is no selection.


svn path=/trunk/; revision=23893
parent 07000d59
2007-10-21 Michael Natterer <mitch@gimp.org>
* app/dialogs/fade-dialog.c (fade_dialog_new): revert change below.
* app/paint-funcs/paint-funcs.c (replace_inten_pixels): also honor
the passed opacity when there is no mask. Fixes blending in
replace mode then where is no selection.
2007-10-21 Sven Neumann <sven@gimp.org>
* app/dialogs/fade-dialog.c (fade_dialog_new): select "Normal"
......@@ -103,12 +103,7 @@ fade_dialog_new (GimpImage *image,
private->orig_opacity = undo->opacity;
g_object_set (private->context,
/* Use Normal mode instead of Replace.
* This is not quite correct but the dialog is somewhat
* difficult to use otherwise.
*/
"paint-mode", (undo->paint_mode == GIMP_REPLACE_MODE ?
GIMP_NORMAL_MODE : undo->paint_mode),
"paint-mode", undo->paint_mode,
"opacity", undo->opacity,
NULL);
......
......@@ -1397,7 +1397,7 @@ replace_inten_pixels (const guchar *src1,
}
else
{
const guchar mask_alpha = OPAQUE_OPACITY;
const guchar mask_alpha = opacity;
while (length --)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment