Hi Jason, Congratulations with the r30k commit! :)
-Ton- ------------------------------------------------------------------------ Ton Roosendaal Blender Foundation [email protected] www.blender.org Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands On 5 Jul, 2010, at 20:45, Jason Wilkins wrote: > Revision: 30000 > > http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30000 > Author: jwilkins > Date: 2010-07-05 20:45:36 +0200 (Mon, 05 Jul 2010) > > Log Message: > ----------- > * smooth stroke doesn't work well with anchored or drag dot strokes > > Modified Paths: > -------------- > branches/soc-2010-jwilkins/release/scripts/ui/ > space_view3d_toolbar.py > branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/ > paint_stroke.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-05 18:45:28 UTC (rev 29999) > +++ branches/soc-2010-jwilkins/release/scripts/ui/ > space_view3d_toolbar.py 2010-07-05 18:45:36 UTC (rev 30000) > @@ -917,16 +917,16 @@ > row.active = brush.use_space > row.prop(brush, "spacing", text="Spacing", > slider=True) > > - col = layout.column() > - col.active = brush.sculpt_tool not in ('GRAB', 'THUMB', > 'SNAKE_HOOK', 'ROTATE') > - col.separator() > + if brush.sculpt_tool not in ('GRAB', 'THUMB', > 'SNAKE_HOOK', 'ROTATE') and (not brush.use_anchor) and (not > brush.restore_mesh): > + col = layout.column() > + col.separator() > > - col.prop(brush, "use_smooth_stroke") > + col.prop(brush, "use_smooth_stroke") > > - sub = col.column() > - sub.active = brush.use_smooth_stroke > - sub.prop(brush, "smooth_stroke_radius", text="Radius", > slider=True) > - sub.prop(brush, "smooth_stroke_factor", text="Factor", > slider=True) > + sub = col.column() > + sub.active = brush.use_smooth_stroke > + sub.prop(brush, "smooth_stroke_radius", > text="Radius", slider=True) > + sub.prop(brush, "smooth_stroke_factor", > text="Factor", slider=True) > else: > row = col.row() > row.prop(brush, "use_airbrush") > > Modified: branches/soc-2010-jwilkins/source/blender/editors/ > sculpt_paint/paint_stroke.c > =================================================================== > --- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/ > paint_stroke.c 2010-07-05 18:45:28 UTC (rev 29999) > +++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/ > paint_stroke.c 2010-07-05 18:45:36 UTC (rev 30000) > @@ -818,8 +818,11 @@ > output[0] = event->x; > output[1] = event->y; > > - if(stroke->brush->flag & BRUSH_SMOOTH_STROKE && > - !ELEM4(stroke->brush->sculpt_tool, SCULPT_TOOL_GRAB, > SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK)) { > + if (stroke->brush->flag & BRUSH_SMOOTH_STROKE && > + !ELEM4(stroke->brush->sculpt_tool, SCULPT_TOOL_GRAB, > SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK) && > + !stroke->brush->flag & BRUSH_ANCHORED && > + !stroke->brush->flag & BRUSH_RESTORE_MESH) > + { > float u = stroke->brush->smooth_stroke_factor, v = 1.0 - u; > float dx = stroke->last_mouse_position[0] - event->x, dy = > stroke- > >last_mouse_position[1] - event->y; > > > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
