[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34643] trunk/blender/source/blender/ blenkernel/intern/brush.c: Fix #25933: Drag Dog stroke method uses Jitter if set for other stroke method, but no jitter available.

[Sergey Sharybin]

Revision: 34643
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34643
Author:   nazgul
Date:     2011-02-04 16:10:30 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
Fix #25933: Drag Dog stroke method uses Jitter if set for other stroke method, but no jitter available.

Manually disable jitter usage for anchored and drag dot brush stroke metdhods.
Jitter slider is hidden in UI for this strokes so users can't set it to 0 by hand
and even if this slider would be visible in UI jitter gives wierd result for
this stroke methods.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/brush.c

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2011-02-04 15:48:13 UTC (rev 34642)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2011-02-04 16:10:30 UTC (rev 34643)
@@ -907,7 +907,13 @@
 
 void brush_jitter_pos(Brush *brush, float *pos, float *jitterpos)
 {
-	if(brush->jitter){
+	int use_jitter= brush->jitter != 0;
+
+	/* jitter-ed brush gives wierd and unpredictable result for this
+	   kinds of stroke, so manyally disable jitter usage (sergey) */
+	use_jitter&= (brush->flag & (BRUSH_RESTORE_MESH|BRUSH_ANCHORED)) == 0;
+
+	if(use_jitter){
 		float rand_pos[2];
 		const int radius= brush_size(brush);
 		const int diameter= 2*radius;