[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39085] branches/soc-2011-onion/source/ blender/editors/sculpt_paint: smooth brush

[Antony Riakiotakis]

Revision: 39085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39085
Author:   psy-fi
Date:     2011-08-05 21:25:17 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
smooth brush
============
-Fix in brush_drawcursor, caused brushes of all paint modes to be the same as image paint, causing UV smoothing to use the unified settings, thus incapacitating the size control. Jason can you check? Left original code commented in case this was so for a reason.
-attempt to fix svn tags, though I suspect this is not the right way.

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c	2011-08-05 20:45:26 UTC (rev 39084)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c	2011-08-05 21:25:17 UTC (rev 39085)
@@ -5036,8 +5036,9 @@
 #define PX_SIZE_FADE_MAX 12.0f
 #define PX_SIZE_FADE_MIN 4.0f
 
-	Brush *brush= image_paint_brush(C);
+//	Brush *brush= image_paint_brush(C);
 	Paint *paint= paint_get_active(CTX_data_scene(C));
+	Brush *brush= paint_brush(paint);
 
 	if(paint && brush && paint->flags & PAINT_SHOW_BRUSH) {
 		float zoomx, zoomy;

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c	2011-08-05 20:45:26 UTC (rev 39084)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c	2011-08-05 21:25:17 UTC (rev 39085)
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: paint_image.c 39083 2011-08-05 20:40:57Z psy-fi $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *