[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44927] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: bugfix. Brush zoom could fail if uv sculpting was on

[Antony Riakiotakis]

Revision: 44927
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44927
Author:   psy-fi
Date:     2012-03-16 21:26:18 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
bugfix. Brush zoom could fail if uv sculpting was on

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-03-16 20:42:29 UTC (rev 44926)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-03-16 21:26:18 UTC (rev 44927)
@@ -5164,13 +5164,15 @@
 		ToolSettings *ts;
 		float zoomx, zoomy;
 		const float size= (float)brush_size(scene, brush);
-		const short use_zoom= get_imapaint_zoom(C, &zoomx, &zoomy);
+		short use_zoom;
 		float pixel_size;
 		float alpha= 0.5f;
 
 		ts = scene->toolsettings;
+		use_zoom= get_imapaint_zoom(C, &zoomx, &zoomy)
+			&& !(ts->use_uv_sculpt && (scene->basact->object->mode == OB_MODE_EDIT));
 
-		if(use_zoom && !ts->use_uv_sculpt){
+		if(use_zoom){
 			pixel_size = MAX2(size * zoomx, size * zoomy);
 		}
 		else {
@@ -5190,7 +5192,7 @@
 		glTranslatef((float)x, (float)y, 0.0f);
 
 		/* No need to scale for uv sculpting, on the contrary it might be useful to keep unscaled */
-		if(use_zoom && !ts->use_uv_sculpt)
+		if(use_zoom)
 			glScalef(zoomx, zoomy, 1.0f);
 
 		glColor4f(brush->add_col[0], brush->add_col[1], brush->add_col[2], alpha);