gimp r25696 - in trunk: . app/paint

[martinn svn gnome org]

Author: martinn
Date: Sun May 18 13:10:23 2008
New Revision: 25696
URL: http://svn.gnome.org/viewvc/gimp?rev=25696&view=rev

Log:
2008-05-18  Martin Nordholts  <martinn svn gnome org>

	Applied patch from Alexia Death that makes velocity dynamics
	controlled scale properly recalculate the brush mask when
	necessary (bug #533618).

	* app/paint/gimpbrushcore.[ch] (gimp_brush_core_scale_mask): A
	change in scale requires a recalculation of the cached brush mask.


Modified:
   trunk/ChangeLog
   trunk/app/paint/gimpbrushcore.c
   trunk/app/paint/gimpbrushcore.h

Modified: trunk/app/paint/gimpbrushcore.c
==============================================================================
--- trunk/app/paint/gimpbrushcore.c	(original)
+++ trunk/app/paint/gimpbrushcore.c	Sun May 18 13:10:23 2008
@@ -1325,12 +1325,12 @@
     return brush->mask;
 
   gimp_brush_scale_size (brush, core->scale, &width, &height);
-
-  if (! core->cache_invalid                 &&
-      core->scale_brush                     &&
-      brush->mask == core->last_scale_brush &&
-      width       == core->last_scale_width &&
-      height      == core->last_scale_height)
+  if (! core->cache_invalid                      &&
+      core->scale_brush                          &&
+      core->last_scale == core->scale            &&
+      brush->mask      == core->last_scale_brush &&
+      width            == core->last_scale_width &&
+      height           == core->last_scale_height)
     {
       return core->scale_brush;
     }
@@ -1338,6 +1338,7 @@
   core->last_scale_brush  = brush->mask;
   core->last_scale_width  = width;
   core->last_scale_height = height;
+  core->last_scale        = core->scale;
 
   if (core->scale_brush)
     temp_buf_free (core->scale_brush);

Modified: trunk/app/paint/gimpbrushcore.h
==============================================================================
--- trunk/app/paint/gimpbrushcore.h	(original)
+++ trunk/app/paint/gimpbrushcore.h	Sun May 18 13:10:23 2008
@@ -58,6 +58,7 @@
   TempBuf       *last_scale_brush;
   gint           last_scale_width;
   gint           last_scale_height;
+  gdouble        last_scale;
 
   TempBuf       *scale_pixmap;
   TempBuf       *last_scale_pixmap;