[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56237] trunk/blender/source/blender/ editors/sculpt_paint/paint_cursor.c: Fix issue reported by Campbell: Move texture existence check out of loop

[Antony Riakiotakis]

Revision: 56237
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56237
Author:   psy-fi
Date:     2013-04-23 11:02:36 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Fix issue reported by Campbell: Move texture existence check out of loop
and exit ovelay display early. Avoids possible garbage value reading.
Thanks!

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-04-23 10:28:13 UTC (rev 56236)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-04-23 11:02:36 UTC (rev 56237)
@@ -124,9 +124,7 @@
 	                           (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY);
 
 	target = (primary) ? &primary_snap : &secondary_snap;
-	
-	if (mtex->brush_map_mode != MTEX_MAP_MODE_VIEW && !mtex->tex) return 0;
-	
+		
 	refresh = 
 	    !target->overlay_texture ||
 	    (invalid != 0) ||
@@ -175,8 +173,7 @@
 		else
 			buffer = MEM_mallocN(sizeof(GLubyte) * size * size, "load_tex");
 
-		if (mtex->tex)
-			pool = BKE_image_pool_new();
+		pool = BKE_image_pool_new();
 
 		#pragma omp parallel for schedule(static)
 		for (j = 0; j < size; j++) {
@@ -228,8 +225,7 @@
 					if (col) {
 						float rgba[4];
 
-						if (mtex->tex)
-							paint_get_tex_pixel_col(mtex, x, y, rgba, pool);
+						paint_get_tex_pixel_col(mtex, x, y, rgba, pool);
 
 						buffer[index * 4]     = rgba[0] * 255;
 						buffer[index * 4 + 1] = rgba[1] * 255;
@@ -237,7 +233,7 @@
 						buffer[index * 4 + 3] = rgba[3] * 255;
 					}
 					else {
-						float avg = mtex->tex ? paint_get_tex_pixel(mtex, x, y, pool) : 1;
+						float avg = paint_get_tex_pixel(mtex, x, y, pool);
 
 						avg += br->texture_sample_bias;
 
@@ -530,9 +526,9 @@
 	                         (brush->overlay_flags & BRUSH_OVERLAY_SECONDARY) != 0;
 	int overlay_alpha = (primary) ? brush->texture_overlay_alpha : brush->mask_overlay_alpha;
 
-	if (!((mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL && mtex->tex) ||
+	if (!(mtex->tex) || !((mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) ||
 	    (valid &&
-	    ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
+		ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
 	{
 		return;
 	}