gimp r27383 - in trunk: . app/core

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 23 22:48:46 2008
New Revision: 27383
URL: http://svn.gnome.org/viewvc/gimp?rev=27383&view=rev

Log:
2008-10-24  Michael Natterer  <mitch gimp org>

	Another merge from the vector layer branch:

	* app/core/gimpstrokedesc.c (gimp_stroke_desc_new): make sure
	each stroke desc always has GimpPaintInfo.



Modified:
   trunk/ChangeLog
   trunk/app/core/gimpstrokedesc.c

Modified: trunk/app/core/gimpstrokedesc.c
==============================================================================
--- trunk/app/core/gimpstrokedesc.c	(original)
+++ trunk/app/core/gimpstrokedesc.c	Thu Oct 23 22:48:46 2008
@@ -307,12 +307,10 @@
   g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
 
   if (context)
-    {
-      paint_info = gimp_context_get_paint_info (context);
+    paint_info = gimp_context_get_paint_info (context);
 
-      if (! paint_info)
-        paint_info = gimp_paint_info_get_standard (gimp);
-    }
+  if (! paint_info)
+    paint_info = gimp_paint_info_get_standard (gimp);
 
   desc = g_object_new (GIMP_TYPE_STROKE_DESC,
                        "gimp",       gimp,