gimp r26825 - in branches/gimp-2-4: . app/core

[neo svn gnome org]

Author: neo
Date: Mon Sep  1 20:26:31 2008
New Revision: 26825
URL: http://svn.gnome.org/viewvc/gimp?rev=26825&view=rev

Log:
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.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/core/gimpprojection-construct.c

Modified: branches/gimp-2-4/app/core/gimpprojection-construct.c
==============================================================================
--- branches/gimp-2-4/app/core/gimpprojection-construct.c	(original)
+++ branches/gimp-2-4/app/core/gimpprojection-construct.c	Mon Sep  1 20:26:31 2008
@@ -338,9 +338,9 @@
  * @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 @@
 
       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)                                                  &&