[gimp/gimp-2-10] app: in gimppaintcore-loops, unsuppress COMBINE_PAINT_MASK_TO_CANVAS_BUFFER algorithm

[Ell <ell src gnome org>]

commit de1ac871e953478f92fdd2c2c71ab3dcc7269eab
Author: Ell <ell_se yahoo com>
Date:   Sat Feb 16 14:09:35 2019 -0500

    app: in gimppaintcore-loops, unsuppress COMBINE_PAINT_MASK_TO_CANVAS_BUFFER algorithm
    
    In gimppaintcore-loops, unsuppress the
    COMBINE_PAINT_MASK_TO_CANVAS_BUFFER algorithm (partially
    reverts commit b717ead1abd487f663668ac131883dff0ffe4557.)
    
    In gimp_paint_core_paste() it's always used together with
    CANVAS_BUFFER_TO_PAINT_BUF_ALPHA, which matches a combined
    algorithm, preventing it from being called, however, it can still
    be called through gimp_paint_core_replace(), which uses it
    together with CANVAS_BUFFER_TO_COMP_MASK, which doesn't have a
    combined algorithm.  We can, however, filter out
    CANVAS_BUFFER_TO_PAINT_BUF_ALPHA whenver
    COMBINE_PAINT_MASK_TO_CANVAS_BUFFER is matched (since the combined
    algorithm will be matched beforehand when both algorithms are
    included).
    
    (cherry picked from commit 6fe57a946bd22cdc04eff2529497550752b7c773)

 app/paint/gimppaintcore-loops.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/app/paint/gimppaintcore-loops.cc b/app/paint/gimppaintcore-loops.cc
index f0f9195d6d..3a163d9b35 100644
--- a/app/paint/gimppaintcore-loops.cc
+++ b/app/paint/gimppaintcore-loops.cc
@@ -1249,6 +1249,7 @@ struct CombinePaintMaskToCanvasBuffer :
   static constexpr guint filter =
     base_type::filter                                                   |
     GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER |
+    GIMP_PAINT_CORE_LOOPS_ALGORITHM_CANVAS_BUFFER_TO_PAINT_BUF_ALPHA    |
     GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_PAINT_BUF_ALPHA       |
     GIMP_PAINT_CORE_LOOPS_ALGORITHM_PAINT_MASK_TO_COMP_MASK;
 
@@ -1316,7 +1317,7 @@ struct CombinePaintMaskToCanvasBuffer :
   }
 };
 
-static SuppressedAlgorithmDispatch<
+static AlgorithmDispatch<
   CombinePaintMaskToCanvasBuffer,
   GIMP_PAINT_CORE_LOOPS_ALGORITHM_COMBINE_PAINT_MASK_TO_CANVAS_BUFFER,
   decltype (dispatch_paint_mask),