gimp r27461 - in branches/gimp-2-6: . app/core

[neo svn gnome org]

Author: neo
Date: Wed Oct 29 19:18:37 2008
New Revision: 27461
URL: http://svn.gnome.org/viewvc/gimp?rev=27461&view=rev

Log:
2008-10-29  Sven Neumann  <sven gimp org>

	Merged from trunk:

	Bug 558420 â projection incorrect with alpha-less layers

	* app/core/gimpprojection-construct.c 
(gimp_projection_initialize):
	need to initialize the projection if the covering layer is not
	opaque.



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

Modified: branches/gimp-2-6/app/core/gimpprojection-construct.c
==============================================================================
--- branches/gimp-2-6/app/core/gimpprojection-construct.c	(original)
+++ branches/gimp-2-6/app/core/gimpprojection-construct.c	Wed Oct 29 19:18:37 2008
@@ -361,13 +361,14 @@
 
       gimp_item_offsets (item, &off_x, &off_y);
 
-      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)                                                  &&
-          (off_x + gimp_item_width  (item) >= x + w)                    &&
+      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       &&
+          gimp_layer_get_opacity (GIMP_LAYER (item)) == GIMP_OPACITY_OPAQUE &&
+          (off_x <= x)                                                      &&
+          (off_y <= y)                                                      &&
+          (off_x + gimp_item_width  (item) >= x + w)                        &&
           (off_y + gimp_item_height (item) >= y + h))
         {
           coverage = TRUE;