gimp r25698 - in trunk: . app/paint

[mitch svn gnome org]

Author: mitch
Date: Sun May 18 13:55:57 2008
New Revision: 25698
URL: http://svn.gnome.org/viewvc/gimp?rev=25698&view=rev

Log:
2008-05-18  Michael Natterer  <mitch gimp org>

	* app/paint/gimpbrushcore.c: clean up last patch.



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

Modified: trunk/app/paint/gimpbrushcore.c
==============================================================================
--- trunk/app/paint/gimpbrushcore.c	(original)
+++ trunk/app/paint/gimpbrushcore.c	Sun May 18 13:55:57 2008
@@ -186,6 +186,7 @@
   core->last_scale_brush         = NULL;
   core->last_scale_width         = 0;
   core->last_scale_height        = 0;
+  core->last_scale               = 1.0;
 
   core->scale_pixmap             = NULL;
   core->last_scale_pixmap        = NULL;
@@ -1325,12 +1326,13 @@
     return brush->mask;
 
   gimp_brush_scale_size (brush, core->scale, &width, &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)
+
+  if (! core->cache_invalid                  &&
+      core->scale_brush                      &&
+      brush->mask == core->last_scale_brush  &&
+      width       == core->last_scale_width  &&
+      height      == core->last_scale_height &&
+      core->scale == core->last_scale)
     {
       return core->scale_brush;
     }