From d348220997a83f8b677c52f7d7a6eb0afc2a7742 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Mon, 30 Jan 2017 21:47:22 +0100
Subject: [PATCH] app: remove the HSV modes from the default layer mode group

---
 app/core/gimp-layer-modes.c         | 8 ++++----
 app/widgets/gimplayermodecombobox.c | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/core/gimp-layer-modes.c b/app/core/gimp-layer-modes.c
index 91499615b2..ce0f455092 100644
--- a/app/core/gimp-layer-modes.c
+++ b/app/core/gimp-layer-modes.c
@@ -570,28 +570,28 @@ gimp_layer_mode_get_for_group (GimpLayerMode       old_mode,
     },
 
     {
-      GIMP_LAYER_MODE_HSV_HUE,
+      -1,
       -1,
       GIMP_LAYER_MODE_HSV_HUE,
       GIMP_LAYER_MODE_HSV_HUE_LEGACY
     },
 
     {
-      GIMP_LAYER_MODE_HSV_SATURATION,
+      -1,
       -1,
       GIMP_LAYER_MODE_HSV_SATURATION,
       GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
     },
 
     {
-      GIMP_LAYER_MODE_HSV_COLOR,
+      -1,
       -1,
       GIMP_LAYER_MODE_HSV_COLOR,
       GIMP_LAYER_MODE_HSV_COLOR_LEGACY
     },
 
     {
-      GIMP_LAYER_MODE_HSV_VALUE,
+      -1,
       -1,
       GIMP_LAYER_MODE_HSV_VALUE,
       GIMP_LAYER_MODE_HSV_VALUE_LEGACY
diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c
index 60c6fafa40..19f3ec4f3d 100644
--- a/app/widgets/gimplayermodecombobox.c
+++ b/app/widgets/gimplayermodecombobox.c
@@ -334,7 +334,7 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo)
   GtkListStore *store;
 
   store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
-                                           32,
+                                           28,
                                            GIMP_LAYER_MODE_NORMAL,
                                            GIMP_LAYER_MODE_DISSOLVE,
                                            GIMP_LAYER_MODE_LIGHTEN_ONLY,
@@ -354,10 +354,6 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo)
                                            GIMP_LAYER_MODE_GRAIN_EXTRACT,
                                            GIMP_LAYER_MODE_GRAIN_MERGE,
                                            GIMP_LAYER_MODE_DIVIDE,
-                                           GIMP_LAYER_MODE_HSV_HUE,
-                                           GIMP_LAYER_MODE_HSV_SATURATION,
-                                           GIMP_LAYER_MODE_HSV_COLOR,
-                                           GIMP_LAYER_MODE_HSV_VALUE,
                                            GIMP_LAYER_MODE_LCH_HUE,
                                            GIMP_LAYER_MODE_LCH_CHROMA,
                                            GIMP_LAYER_MODE_LCH_COLOR,
@@ -383,9 +379,6 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo)
   gimp_layer_mode_combo_box_insert_separator (store,
                                               GIMP_LAYER_MODE_DIVIDE, -1);
 
-  gimp_layer_mode_combo_box_insert_separator (store,
-                                              GIMP_LAYER_MODE_HSV_VALUE, -1);
-
   gimp_layer_mode_combo_box_insert_separator (store,
                                               GIMP_LAYER_MODE_LCH_LIGHTNESS, -1);