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

Return the active layer instead of the bottom layer when just merging down 

2004-11-13  Simon Budig  <simon@gimp.org>

	* app/core/gimpimage-merge.c: Return the active layer instead of
	the bottom layer when just merging down a floating selection.
	Untabbified.

	Fixes bug #158130.
This commit is contained in:
Simon Budig 2004-11-13 01:59:16 +00:00 committed by Simon Budig
parent a830d56f30
commit 7945dc7a4b
2 changed files with 128 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-11-13 Simon Budig <simon@gimp.org>
* app/core/gimpimage-merge.c: Return the active layer instead of
the bottom layer when just merging down a floating selection.
Untabbified.
Fixes bug #158130.
2004-11-12 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-dump.c better fix for bug #157971.

2
app/core/gimpimage-merge.c
View File

@ -102,7 +102,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage,
/* If there was a floating selection, we have done something.
No need to warn the user. Return the active layer instead */
if (had_floating_sel)
return layer;
return gimage->active_layer;
else
g_message (_("Not enough visible layers for a merge. "
"There must be at least two."));