dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Natterer 2007-10-21 19:00:28 +00:00 committed by Michael Natterer
parent 07000d590a
commit 5bb9eb7f3f
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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"

7
app/dialogs/fade-dialog.c
View File

@ -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);

2
app/paint-funcs/paint-funcs.c
View File

@ -1397,7 +1397,7 @@ replace_inten_pixels (const guchar *src1,
}
else
{
const guchar mask_alpha = OPAQUE_OPACITY;
const guchar mask_alpha = opacity;
while (length --)
{