Folding in Zach Beane's layer opacity on merge changes.

ChangeLog

+Mon Aug 31 11:35:00 CST 1998 Seth Burgess <sjburges@gimp.org>
+	* app/gimage.c
+	* app/gimpimage.c: Applied Zach's fix for layer merge opacity.  I
+	still don't really like setting opacity to 100% regardless, but at
+	least it looks like it behaves correctly.  
+
 Sun Aug 30 19:02:56 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* app/Makefile.am

app/core/gimpimage-guides.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpimage-merge.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpimage-projection.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpimage-resize.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpimage-scale.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpimage.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/core/gimpprojection-construct.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }

app/gimpimage.c

@@ -1699,6 +1699,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
   if (merge_list && merge_list->next)
     {
       layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
+      layer->opacity = 255;
       g_slist_free (merge_list);
       return layer;
     }