dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Seth Burgess 1998-08-31 16:40:58 +00:00
parent 6a329e8dc0
commit 1f325983b7
9 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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> Sun Aug 30 19:02:56 PDT 1998 Manish Singh <yosh@gimp.org>
* app/Makefile.am * app/Makefile.am

1
app/core/gimpimage-guides.c
View File

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

1
app/core/gimpimage-merge.c
View File

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

1
app/core/gimpimage-projection.c
View File

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

1
app/core/gimpimage-resize.c
View File

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

1
app/core/gimpimage-scale.c
View File

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

1
app/core/gimpimage.c
View File

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

1
app/core/gimpprojection-construct.c
View File

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

1
app/gimpimage.c
View File

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