[gimp] Bug 775134 - mypaint-brush: Saved color in a brush isn't taken into account

[Michael Natterer <mitch src gnome org>]

commit 350c6ca1f7a4c53f5a51933eae2c9bb7c9c0e649
Author: Michael Natterer <mitch gimp org>
Date:   Sun Dec 11 19:39:33 2016 +0100

    Bug 775134 - mypaint-brush: Saved color in a brush isn't taken into account
    
    gimp_mybrush_core_create_brushes(): don't set the current FG or BG on
    the brush if its RESTORE_COLOR setting is 1.0 (TRUE).

 app/paint/gimpmybrushcore.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/app/paint/gimpmybrushcore.c b/app/paint/gimpmybrushcore.c
index e180479..d0931a5 100644
--- a/app/paint/gimpmybrushcore.c
+++ b/app/paint/gimpmybrushcore.c
@@ -381,15 +381,19 @@ gimp_mybrush_core_create_brushes (GimpMybrushCore  *mybrush,
       if (brush_data)
         mypaint_brush_from_string (brush, brush_data);
 
-      mypaint_brush_set_base_value (brush,
-                                    MYPAINT_BRUSH_SETTING_COLOR_H,
-                                    hsv.h);
-      mypaint_brush_set_base_value (brush,
-                                    MYPAINT_BRUSH_SETTING_COLOR_S,
-                                    hsv.s);
-      mypaint_brush_set_base_value (brush,
-                                    MYPAINT_BRUSH_SETTING_COLOR_V,
-                                    hsv.v);
+      if (! mypaint_brush_get_base_value (brush,
+                                          MYPAINT_BRUSH_SETTING_RESTORE_COLOR))
+        {
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_H,
+                                        hsv.h);
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_S,
+                                        hsv.s);
+          mypaint_brush_set_base_value (brush,
+                                        MYPAINT_BRUSH_SETTING_COLOR_V,
+                                        hsv.v);
+        }
 
       mypaint_brush_set_base_value (brush,
                                     MYPAINT_BRUSH_SETTING_RADIUS_LOGARITHMIC,