[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30151] branches/soc-2010-jwilkins: * i can see creative uses for random rotation and drag dot

[Jason Wilkins]

Revision: 30151
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30151
Author:   jwilkins
Date:     2010-07-09 13:48:51 +0200 (Fri, 09 Jul 2010)

Log Message:
-----------
* i can see creative uses for random rotation and drag dot
* however, random rotation and rake are mutually exclusive

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-09 11:41:26 UTC (rev 30150)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-09 11:48:51 UTC (rev 30151)
@@ -806,7 +806,7 @@
 
             col = layout.column()
             col.prop(brush, "use_random_rotation")
-            col.active = (not brush.use_anchor) and brush.sculpt_tool not in ('GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE') and tex_slot.map_mode in ('FIXED') and (not brush.restore_mesh)
+            col.active = (not brush.use_rake) and (not brush.use_anchor) and brush.sculpt_tool not in ('GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE') and tex_slot.map_mode in ('FIXED')
 
             split = layout.split()
 

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-09 11:41:26 UTC (rev 30150)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-09 11:48:51 UTC (rev 30151)
@@ -2900,9 +2900,9 @@
 	if(!(brush->flag & BRUSH_ANCHORED || ELEM4(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE))) {
 		copy_v2_v2(cache->tex_mouse, cache->mouse);
 
-		if  (brush->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED && 
-			 !(brush->flag & BRUSH_RESTORE_MESH) && 
-			 brush->flag & BRUSH_RANDOM_ROTATION)
+		if  ( (brush->mtex.brush_map_mode == MTEX_MAP_MODE_FIXED) &&
+			  (brush->flag & BRUSH_RANDOM_ROTATION) &&
+			 !(brush->flag & BRUSH_RAKE))
 		{
 			cache->special_rotation = 2*M_PI*BLI_frand();
 		}