[gimp] app: fix force slider dynamics interacttion to just dynamics when activated

[Alexia Death <alexiade src gnome org>]

commit 2a7dbbd438364583eda091c931b9daa20ad895bb
Author: Alexia Death <alexiadeath gmail com>
Date:   Mon Nov 17 17:05:29 2014 +0200

    app: fix force slider dynamics interacttion to just dynamics when activated

 app/paint/gimppaintbrush.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
index c8ac50c..43d45ae 100644
--- a/app/paint/gimppaintbrush.c
+++ b/app/paint/gimppaintbrush.c
@@ -211,9 +211,8 @@ _gimp_paintbrush_motion (GimpPaintCore    *paint_core,
   force = 0.5;
   option_force = paint_options->brush_force / 100.0;
 
-  if ((option_force != 0.5) && gimp_dynamics_output_is_enabled (dyn_output))
-    force = option_force + (1 - option_force) * dyn_force;
-
+  if (gimp_dynamics_output_is_enabled (dyn_output))
+    force = dyn_force;
   else if (option_force != 0.5)
     force = option_force;