--- gimp-painter-_old/app/dialogs/about-dialog.c	Wed Sep 24 16:40:16 2008
+++ gimp-painter--2.6.0/app/dialogs/about-dialog.c	Tue Oct  7 13:18:16 2008
@@ -597,9 +597,9 @@
 static void
 about_dialog_add_message (GtkWidget *vbox)
 {
-#ifdef GIMP_UNSTABLE
   GtkWidget *label;
 
+#ifdef GIMP_UNSTABLE
   label = gtk_label_new (_("This is an unstable development release."));
   gimp_label_set_attributes (GTK_LABEL (label),
                              PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
@@ -608,5 +608,10 @@
   gtk_box_reorder_child (GTK_BOX (vbox), label, 2);
   gtk_widget_show (label);
 #endif
+
+  label = gtk_label_new (_("gimp-painter- (release 081007)"));
+  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/dialogs/preferences-dialog.c	Thu Aug 21 20:33:30 2008
+++ gimp-painter--2.6.0/app/dialogs/preferences-dialog.c	Mon Oct  6 13:28:07 2008
@@ -1972,6 +1972,10 @@
   vbox2 = prefs_frame_new (_("Appearance"),
                            GTK_CONTAINER (vbox), FALSE);
 
+  prefs_check_button_add (object, "toolbox-wilber",
+                          _("Show _Wilber"),
+                          GTK_BOX (vbox2));
+
   prefs_check_button_add_with_icon (object, "toolbox-color-area",
                                     _("Show _foreground & background color"),
                                     GIMP_STOCK_DEFAULT_COLORS,
@@ -2630,7 +2634,7 @@
                             _("Hint for other _docks:"),
                             GTK_TABLE (table), 1, size_group);
 
-#ifdef GIMP_UNSTABLE
+#if 1
   prefs_check_button_add (object, "transient-docks",
                           _("Toolbox and other docks are transient "
                             "to the active image window"),
--- gimp-painter-_old/app/display/gimpdisplayshell-callbacks.c	Tue Sep 30 02:09:24 2008
+++ gimp-painter--2.6.0/app/display/gimpdisplayshell-callbacks.c	Mon Oct  6 16:29:38 2008
@@ -41,6 +41,7 @@
 #include "core/gimpimage-quick-mask.h"
 #include "core/gimplayer.h"
 #include "core/gimptoolinfo.h"
+#include "core/gimptooloptions.h"
 
 #include "tools/gimpimagemaptool.h"
 #include "tools/gimpmovetool.h"
@@ -1196,6 +1197,11 @@
               {
                 GdkTimeCoord **history_events;
                 gint           n_history_events;
+                gdouble        max_coord_smooth = 0;
+                GimpToolOptions *active_tool_options;
+
+                if ((active_tool_options = GIMP_TOOL_GET_OPTIONS (active_tool)))
+                  max_coord_smooth = active_tool_options->max_coord_smooth;
 
                 /*  if the first mouse button is down, check for automatic
                  *  scrolling...
@@ -1257,7 +1263,7 @@
                          */
                         if (gimp_display_shell_eval_event (shell,
                                                            &image_coords,
-                                                           active_tool->max_coord_smooth,
+                                                           max_coord_smooth,
                                                            history_events[i]->time))
                           {
                             tool_manager_motion_active (gimp,
@@ -1278,7 +1284,7 @@
                      */
                     if (gimp_display_shell_eval_event (shell,
                                                        &image_coords,
-                                                       active_tool->max_coord_smooth,
+                                                       max_coord_smooth,
                                                        time))
                       {
                         tool_manager_motion_active (gimp,
--- gimp-painter-_old/app/paint/gimpmixbrush.c	Fri Oct  3 15:36:08 2008
+++ gimp-painter--2.6.0/app/paint/gimpmixbrush.c	Mon Oct  6 21:57:06 2008
@@ -1054,7 +1054,7 @@
 {
   CompositeDabParam params;
 
-  TempBuf     *brush_mask = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (core), GIMP_BRUSH_SOFT, hardness);
+  TempBuf     *brush_mask = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (core), GIMP_BRUSH_PRESSURE, hardness);
   TempBuf     *canvas_buf = core->canvas_buf;
   gint         c_x, c_y, c_w, c_h;
   PixelRegion  srcPR, maskPR;
--- gimp-painter-_old/app/paint/gimppaintoptions.c	Fri Oct  3 15:00:02 2008
+++ gimp-painter--2.6.0/app/paint/gimppaintoptions.c	Mon Oct  6 16:23:21 2008
@@ -84,7 +84,7 @@
 #define DEFAULT_UPDATE_FREQ_GAMMA        1.35
 #define DEFAULT_UPDATE_FREQ_MAX_N_DABS   18
 
-#define DEFAULT_MAX_COORD_SMOOTH         0.98
+#define DEFAULT_MAX_COORD_SMOOTH         0.8
 
 
 enum
--- gimp-painter-_old/app/tools/gimppaintoptions-gui.c	Fri Oct  3 18:36:58 2008
+++ gimp-painter--2.6.0/app/tools/gimppaintoptions-gui.c	Tue Oct  7 14:09:41 2008
@@ -162,6 +162,12 @@
                                        0.01, 0.1, 2,
                                        FALSE, 0.0, 0.0);
       gimp_scale_entry_set_logarithmic (adj, TRUE);
+
+      gimp_prop_scale_entry_new (config, "pressure-min-scale",
+                                 GTK_TABLE (table), 0, table_row++,
+                                 _("Minimum scale:"),
+                                 0.01, 0.1, 2,
+                                 FALSE, 0.0, 0.0);
     }
 
   if (tool_has_opacity_dynamics (tool_type))
@@ -345,6 +351,7 @@
           tool_type == GIMP_TYPE_ERASER_TOOL            ||
           tool_type == GIMP_TYPE_DODGE_BURN_TOOL        ||
           tool_type == GIMP_TYPE_PAINTBRUSH_TOOL        ||
+          tool_type == GIMP_TYPE_MIXBRUSH_TOOL          ||
           tool_type == GIMP_TYPE_SMUDGE_TOOL);
 }