[gimp] app: fix logic error in tool_options_manager_paint_options_notify()

[Michael Natterer <mitch src gnome org>]

commit 1ef705632453e95672f2f5d2c1a81be2e5221099
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jun 29 13:16:01 2018 +0200

    app: fix logic error in tool_options_manager_paint_options_notify()

 app/tools/gimp-tool-options-manager.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/app/tools/gimp-tool-options-manager.c b/app/tools/gimp-tool-options-manager.c
index 7d35555e10..884c246981 100644
--- a/app/tools/gimp-tool-options-manager.c
+++ b/app/tools/gimp-tool-options-manager.c
@@ -343,13 +343,15 @@ tool_options_manager_paint_options_notify (GimpPaintOptions *src,
     {
       prop_mask |= GIMP_CONTEXT_PROP_MASK_BRUSH;
     }
-  else if ((active || config->global_dynamics) &&
-           tool_info->context_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS)
+
+  if ((active || config->global_dynamics) &&
+      tool_info->context_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS)
     {
       prop_mask |= GIMP_CONTEXT_PROP_MASK_DYNAMICS;
     }
-  else if ((active || config->global_gradient) &&
-           tool_info->context_props & GIMP_CONTEXT_PROP_MASK_GRADIENT)
+
+  if ((active || config->global_gradient) &&
+      tool_info->context_props & GIMP_CONTEXT_PROP_MASK_GRADIENT)
     {
       prop_mask |= GIMP_CONTEXT_PROP_MASK_GRADIENT;
     }