[gimp] app: fix bottom-of-stack dissolve layers using src-atop/in

[N/A <ell src gnome org>]

commit a57c7fb129ccd9d83e877059dfab16002a12b9e4
Author: Ell <ell_se yahoo com>
Date:   Sun Feb 26 22:00:16 2017 -0500

    app: fix bottom-of-stack dissolve layers using src-atop/in

 app/core/gimpimage-merge.c |    6 ++++--
 app/core/gimplayer.c       |    9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index d55065c..a6f8675 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -619,9 +619,11 @@ gimp_image_merge_layers (GimpImage     *image,
       composite_space = gimp_layer_get_composite_space (layer);
       composite_mode  = gimp_layer_get_composite_mode (layer);
 
-      if (layer == bottom_layer && mode != GIMP_LAYER_MODE_DISSOLVE)
+      if (layer == bottom_layer)
         {
-          mode            = GIMP_LAYER_MODE_NORMAL_LEGACY;
+          if (mode != GIMP_LAYER_MODE_DISSOLVE)
+            mode          = GIMP_LAYER_MODE_NORMAL_LEGACY;
+
           blend_space     = GIMP_LAYER_COLOR_SPACE_AUTO;
           composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
           composite_mode  = GIMP_LAYER_COMPOSITE_AUTO;
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 90c8ad9..4860217 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -596,10 +596,13 @@ gimp_layer_update_mode_node (GimpLayer *layer)
     }
   else
     {
-      if (layer->mode != GIMP_LAYER_MODE_DISSOLVE &&
-          gimp_filter_get_is_last_node (GIMP_FILTER (layer)))
+      if (gimp_filter_get_is_last_node (GIMP_FILTER (layer)))
         {
-          visible_mode            = GIMP_LAYER_MODE_NORMAL_LEGACY;
+          if (layer->mode != GIMP_LAYER_MODE_DISSOLVE)
+            visible_mode          = GIMP_LAYER_MODE_NORMAL_LEGACY;
+          else
+            visible_mode          = GIMP_LAYER_MODE_DISSOLVE;
+
           visible_blend_space     = GIMP_LAYER_COLOR_SPACE_AUTO;
           visible_composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
           visible_composite_mode  = GIMP_LAYER_COMPOSITE_AUTO;