gimp r26527 - trunk/app/paint-funcs

[neo svn gnome org]

Author: neo
Date: Tue Aug 12 20:50:06 2008
New Revision: 26527
URL: http://svn.gnome.org/viewvc/gimp?rev=26527&view=rev

Log:
followup change for bug #105568


Modified:
   trunk/app/paint-funcs/paint-funcs.c

Modified: trunk/app/paint-funcs/paint-funcs.c
==============================================================================
--- trunk/app/paint-funcs/paint-funcs.c	(original)
+++ trunk/app/paint-funcs/paint-funcs.c	Tue Aug 12 20:50:06 2008
@@ -1419,7 +1419,7 @@
       guchar new_alpha   = INT_BLEND (src2_alpha, src1_alpha,
                                       INT_MULT (*m, opacity, tmp), tmp);
 
-      if (new_alpha && affect[b])
+      if (new_alpha)
         {
           guint ratio = *m * opacity;
 
@@ -1427,7 +1427,11 @@
 
           for (b = 0; b < alpha; b++)
             {
-              if (src2[b] > src1[b])
+              if (! affect[b])
+                {
+                  dest[b] = src1[b];
+                }
+              else if (src2[b] > src1[b])
                 {
                   guint t = (src2[b] - src1[b]) * ratio;
                   dest[b] = src1[b] + INT_DIV (t, 255);