Commit 1f325983 authored by Seth Burgess's avatar Seth Burgess
Browse files

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

parent 6a329e8d
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
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment