Revision: 29996 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29996 Author: jwilkins Date: 2010-07-05 19:46:45 +0200 (Mon, 05 Jul 2010)
Log Message: ----------- * smooth stroke is a modifier of strokes, not a stroke method itself Modified Paths: -------------- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.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 17:35:38 UTC (rev 29995) +++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-07-05 17:46:45 UTC (rev 29996) @@ -911,18 +911,22 @@ row = col.row() row.prop(brush, "rate", text="Rate", slider=True) - if brush.use_smooth_stroke: - col.separator() - col = layout.column() - col.prop(brush, "smooth_stroke_radius", text="Radius", slider=True) - col.prop(brush, "smooth_stroke_factor", text="Factor", slider=True) - col = layout.column() - if brush.use_space: col.separator() row = col.row() 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() + + 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) else: row = col.row() row.prop(brush, "use_airbrush") Modified: branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c =================================================================== --- branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c 2010-07-05 17:35:38 UTC (rev 29995) +++ branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c 2010-07-05 17:46:45 UTC (rev 29996) @@ -143,7 +143,6 @@ {0, "DOTS", 0, "Dots", ""}, {BRUSH_RESTORE_MESH, "DRAG_DOT", 0, "Drag Dot", ""}, {BRUSH_SPACE, "SPACE", 0, "Space", ""}, - {BRUSH_SMOOTH_STROKE, "SMOOTH_STROKE", 0, "Smooth", ""}, {BRUSH_ANCHORED, "ANCHORED", 0, "Anchored", ""}, {BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", ""}, {0, NULL, 0, NULL, NULL}}; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs