[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57644] branches/soc-2013-paint/source/ blender/editors/sculpt_paint/paint_image_2d.c: Yet another fix for mask pressure:

[Antony Riakiotakis]

Revision: 57644
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57644
Author:   psy-fi
Date:     2013-06-21 22:56:40 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
Yet another fix for mask pressure:

Tiled colour texture could activate partial update, make sure to test
separately for mask pressure options and always disable if they are
active.

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-06-21 18:18:37 UTC (rev 57643)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-06-21 22:56:40 UTC (rev 57644)
@@ -587,9 +587,13 @@
 		}
 		else if (brush->mask_mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)
 			do_random = true;
-		else if (!brush->mask_pressure)
+		else
 			do_partial_update = true;
 
+		/* explicilty disable partial update even if it has been enabled above */
+		if (brush->mask_pressure)
+			do_partial_update = false;
+
 		brush_painter_2d_tex_mapping(s, size, painter->startpaintpos, pos, mouse,
 		                             brush->mask_mtex.brush_map_mode, &painter->mask_mapping);
 	}