[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58023] branches/soc-2013-paint/source/ blender/editors/sculpt_paint/paint_stroke.c: Fix anchored strokes not working with mask textures.

Antony Riakiotakis kalast at gmail.com
Fri Jul 5 20:21:33 CEST 2013


Revision: 58023
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58023
Author:   psy-fi
Date:     2013-07-05 18:21:33 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
Fix anchored strokes not working with mask textures.

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

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c	2013-07-05 17:46:06 UTC (rev 58022)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c	2013-07-05 18:21:33 UTC (rev 58023)
@@ -201,14 +201,14 @@
 		else {
 			copy_v2_v2(ups->tex_mouse, mouse);
 		}
-	}
 
-	/* take care of mask texture, if any */
-	if (brush->mask_mtex.tex) {
-		if (brush->mask_mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)
-			BKE_brush_randomize_texture_coordinates(ups, true);
-		else {
-			copy_v2_v2(ups->mask_tex_mouse, mouse);
+		/* take care of mask texture, if any */
+		if (brush->mask_mtex.tex) {
+			if (brush->mask_mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)
+				BKE_brush_randomize_texture_coordinates(ups, true);
+			else {
+				copy_v2_v2(ups->mask_tex_mouse, mouse);
+			}
 		}
 	}
 
@@ -241,6 +241,7 @@
 		if (hit) {
 			copy_v2_v2(ups->anchored_initial_mouse, halfway);
 			copy_v2_v2(ups->tex_mouse, halfway);
+			copy_v2_v2(ups->mask_tex_mouse, halfway);
 			copy_v2_v2(mouse, halfway);
 			ups->anchored_size /= 2.0f;
 			ups->pixel_radius  /= 2.0f;




More information about the Bf-blender-cvs mailing list