--- gimp-painter-_old/app/dialogs/about-dialog.c	Mon Nov  3 18:53:40 2008
+++ gimp-painter--2.6.2/app/dialogs/about-dialog.c	Mon Nov  3 03:44:52 2008
@@ -609,7 +609,7 @@
   gtk_widget_show (label);
 #endif
 
-  label = gtk_label_new (_("gimp-painter- (release 20081024)"));
+  label = gtk_label_new (_("gimp-painter- (release 20081103)"));
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
   gtk_box_reorder_child (GTK_BOX (vbox), label, 2);
   gtk_widget_show (label);
--- gimp-painter-_old/app/paint/gimpmixbrush.c	Mon Nov  3 18:53:41 2008
+++ gimp-painter--2.6.2/app/paint/gimpmixbrush.c	Mon Nov  3 13:45:21 2008
@@ -168,17 +168,18 @@
                                               PressureParams   *params);
 
 #ifndef GIMP_MIXBRUSH_COMPOSITE
-void paste_canvas                            (GimpPaintCore         *core,
-                                              GimpDrawable          *drawable,
-                                              GimpPattern           *texture,
-                                              GimpRGB               *paint_color,
-                                              gdouble                opacity,
-                                              gdouble                hardness,
-                                              gboolean               fringe,
-                                              gdouble                fringe_contrast,
-                                              gdouble                grain,
-                                              gint                   jitter,
-                                              GimpUpdateFreqOptions *update_freq_options);
+void paste_canvas                            (GimpPaintCore            *core,
+                                              GimpDrawable             *drawable,
+                                              GimpPattern              *texture,
+                                              GimpRGB                  *paint_color,
+                                              gdouble                   opacity,
+                                              GimpBrushApplicationMode  hardness_mode,
+                                              gdouble                   hardness,
+                                              gboolean                  fringe,
+                                              gdouble                   fringe_contrast,
+                                              gdouble                   grain,
+                                              gint                      jitter,
+                                              GimpUpdateFreqOptions    *update_freq_options);
 
 static void composite_dab                    (CompositeDabParam *params,
                                               PixelRegion       *srcPR,
@@ -672,7 +673,9 @@
 
             paste_canvas (paint_core, drawable,
                           texture,
-                          last_color, op, history->hardness,
+                          last_color, op,
+                          gimp_paint_options_get_brush_mode (paint_options),
+                          history->hardness,
                           mixbrush_options->texture_options->fringe,
                           mixbrush_options->texture_options->fringe_contrast,
                           grain,
@@ -1041,25 +1044,31 @@
 
 #ifndef GIMP_MIXBRUSH_COMPOSITE
 void
-paste_canvas (GimpPaintCore         *core,
-              GimpDrawable          *drawable,
-              GimpPattern           *texture,
-              GimpRGB               *paint_color,
-              gdouble                opacity,
-              gdouble                hardness,
-              gboolean               fringe,
-              gdouble                fringe_contrast,
-              gdouble                grain,
-              gint                   jitter,
-              GimpUpdateFreqOptions *update_freq_options)
+paste_canvas (GimpPaintCore            *core,
+              GimpDrawable             *drawable,
+              GimpPattern              *texture,
+              GimpRGB                  *paint_color,
+              gdouble                   opacity,
+              GimpBrushApplicationMode  hardness_mode,
+              gdouble                   hardness,
+              gboolean                  fringe,
+              gdouble                   fringe_contrast,
+              gdouble                   grain,
+              gint                      jitter,
+              GimpUpdateFreqOptions    *update_freq_options)
 {
   CompositeDabParam params;
 
-  TempBuf     *brush_mask = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (core), GIMP_BRUSH_PRESSURE, hardness);
-  TempBuf     *canvas_buf = core->canvas_buf;
+  TempBuf     *brush_mask;
+  TempBuf     *canvas_buf;
   gint         c_x, c_y, c_w, c_h;
   PixelRegion  srcPR, maskPR;
   gint         off_x, off_y;
+
+  brush_mask = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (core),
+                                               hardness_mode,
+                                               hardness);
+  canvas_buf = core->canvas_buf;
 
   if (!brush_mask ||
      !canvas_buf ||