Merged from trunk:

2008-09-01  Sven Neumann  <sven@gimp.org>

	Merged from trunk:

	* app/core/gimpprojection-construct.c 
(gimp_projection_initialize):
	also need to initialize the projection if the layer mask could
	introduce transparency. Fixes bug #550024.


svn path=/branches/gimp-2-4/; revision=26825
This commit is contained in:
Sven Neumann 2008-09-01 20:26:31 +00:00 committed by Sven Neumann
parent fcaff6fa21
commit a29a349fec
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2008-09-01 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/core/gimpprojection-construct.c (gimp_projection_initialize):
also need to initialize the projection if the layer mask could
introduce transparency. Fixes bug #550024.
2008-08-23 Lars-Peter Clausen <lars@metafoo.de>
Merged from trunk:

View File

@ -338,9 +338,9 @@ gimp_projection_construct_channels (GimpProjection *proj,
* @w:
* @h:
*
* This function determines whether a visible layer with combine mode Normal
* provides complete coverage over the specified area. If not, the projection
* is initialized to transparent black.
* This function determines whether a visible layer with combine mode
* Normal provides complete coverage over the specified area. If not,
* the projection is initialized to transparent black.
*/
static void
gimp_projection_initialize (GimpProjection *proj,
@ -364,6 +364,7 @@ gimp_projection_initialize (GimpProjection *proj,
if (gimp_item_get_visible (item) &&
! gimp_drawable_has_alpha (GIMP_DRAWABLE (item)) &&
! gimp_layer_get_mask (GIMP_LAYER (item)) &&
gimp_layer_get_mode (GIMP_LAYER (item)) == GIMP_NORMAL_MODE &&
(off_x <= x) &&
(off_y <= y) &&