[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38748] branches/soc-2011-onion/release/ scripts/startup/bl_ui: new paint_stroke interface has only been tested with sculpt, so it now only appears in sculpt mode.
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Jul 27 00:00:42 CEST 2011
Revision: 38748
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38748
Author: jwilkins
Date: 2011-07-26 22:00:42 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
new paint_stroke interface has only been tested with sculpt, so it now only appears in sculpt mode. more missed rna property renames
Modified Paths:
--------------
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py 2011-07-26 21:38:41 UTC (rev 38747)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py 2011-07-26 22:00:42 UTC (rev 38748)
@@ -727,9 +727,9 @@
col.active = brush.use_airbrush
col.prop(brush, "rate", slider=True)
- layout.prop(brush, "use_space")
+ layout.prop(brush, "use_path_stroke")
row = layout.row(align=True)
- row.active = brush.use_space
+ row.active = brush.use_path_stroke
row.prop(brush, "spacing", text="Distance", slider=True)
row.prop(brush, "use_pressure_spacing", toggle=True, text="")
Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-07-26 21:38:41 UTC (rev 38747)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-07-26 22:00:42 UTC (rev 38748)
@@ -897,176 +897,175 @@
brush = settings.brush
image_paint = context.image_paint_object
- db = False
+ if context.sculpt_object:
+ db = False
- col = layout.column()
+ col = layout.column()
- col.prop(brush, "stroke_method", text="")
+ col.prop(brush, "stroke_method", text="")
- # Airbrush
+ # Airbrush
- if db:
- col.prop(brush, "use_airbrush")
+ if db:
+ col.prop(brush, "use_airbrush")
- if brush.use_airbrush:
- col.prop(brush, "rate", text="Rate", slider=True)
+ if brush.use_airbrush:
+ col.prop(brush, "rate", text="Rate", slider=True)
- # Path
+ # Path
- if db:
- col.prop(brush, "use_path_stroke", text="Path")
- col.prop(brush, "use_line", text="Line")
+ if db:
+ col.prop(brush, "use_path_stroke", text="Path")
+ col.prop(brush, "use_line", text="Line")
- if brush.use_path_stroke:
- row = col.row(align=True)
- row.prop(brush, "spacing", text="Spacing", slider=True)
- row.prop(brush, "use_pressure_spacing", text="")
+ if brush.use_path_stroke:
+ row = col.row(align=True)
+ row.prop(brush, "spacing", text="Spacing", slider=True)
+ row.prop(brush, "use_pressure_spacing", text="")
- # Anchored
+ # Anchored
- if db:
- col.prop(brush, "use_anchored_stroke", text="Anchored")
- col.prop(brush, "use_edge_to_edge", text="Edge-to-edge")
+ if db:
+ col.prop(brush, "use_anchored_stroke", text="Anchored")
+ col.prop(brush, "use_edge_to_edge", text="Edge-to-edge")
- # Restore
+ # Restore
- if db:
- col.prop(brush, "use_restore", text="Restore")
-
-
- # Mouse
-
- if not brush.use_anchored_stroke:
- col.label("Position:")
- col.prop(brush, "stroke_mouse_method", text="")
-
if db:
- col.prop(brush, "use_smooth_stroke", text="Smooth Stroke")
+ col.prop(brush, "use_restore", text="Restore")
- if brush.use_smooth_stroke:
- sub = col.column(align=True)
- sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
- sub.prop(brush, "smooth_stroke_factor", text="Smooth", slider=True)
- if db:
- col.prop(brush, "use_snap_mouse", text="Snap Mouse")
+ # Mouse
- if brush.use_snap_mouse:
- row = col.row()
- row.prop(brush, "snap_mouse", text="", slider=False)
+ if not brush.use_anchored_stroke:
+ col.label("Position:")
+ col.prop(brush, "stroke_mouse_method", text="")
- # Mouse Jitter
- row = col.row(align=True)
- row.prop(brush, "use_jitter_mouse", text="", icon="RNDCURVE")
- sub = row.row(align=True)
- sub.active = brush.use_jitter_mouse
- sub.prop(brush, "jitter_mouse", text="Jitter", slider=True)
- sub.prop(brush, "use_pressure_jitter_mouse", text="")
+ if db:
+ col.prop(brush, "use_smooth_stroke", text="Smooth Stroke")
- # One-Way Stroke
- col.prop(brush, "use_oneway_stroke", text="One-Way Stroke")
+ if brush.use_smooth_stroke:
+ sub = col.column(align=True)
+ sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
+ sub.prop(brush, "smooth_stroke_factor", text="Smooth", slider=True)
+ if db:
+ col.prop(brush, "use_snap_mouse", text="Snap Mouse")
- # Pressure
+ if brush.use_snap_mouse:
+ row = col.row()
+ row.prop(brush, "snap_mouse", text="", slider=False)
- col.label("Pressure:")
- col.prop(brush, "stroke_pressure_method", text="")
+ # Mouse Jitter
+ row = col.row(align=True)
+ row.prop(brush, "use_jitter_mouse", text="", icon="RNDCURVE")
+ sub = row.row(align=True)
+ sub.active = brush.use_jitter_mouse
+ sub.prop(brush, "jitter_mouse", text="Jitter", slider=True)
+ sub.prop(brush, "use_pressure_jitter_mouse", text="")
- if db:
- col.prop(brush, "use_pen_pressure", text="Pen Pressure")
- col.prop(brush, "use_smooth_pressure", text="Pen Pressure Smooth")
- col.prop(brush, "use_simulate_pressure", text="Simulate Pressure")
+ # One-Way Stroke
+ col.prop(brush, "use_oneway_stroke", text="One-Way Stroke")
- if brush.use_smooth_pressure:
- col.prop(brush, "smooth_pressure_factor", text="Smooth", slider=True)
- #if brush.use_simulate_pressure:
- # sub = col.column(align=True)
- # sub.prop(brush, "simulate_pressure_start", text="Start", slider=True)
- # sub.prop(brush, "simulate_pressure_fade", text="Fade", slider=True)
+ # Pressure
- # Pressure Jitter
- if brush.use_pen_pressure or brush.use_simulate_pressure:
- row = col.row(align=True)
- row.prop(brush, "use_jitter_pressure", text="", icon="RNDCURVE")
- sub = row.row(align=True)
- sub.active = brush.use_jitter_pressure
- sub.prop(brush, "jitter_pressure", "Jitter", slider=True)
- sub.prop(brush, "use_pressure_jitter_pressure", text="")
+ col.label("Pressure:")
+ col.prop(brush, "stroke_pressure_method", text="")
+ if db:
+ col.prop(brush, "use_pen_pressure", text="Pen Pressure")
+ col.prop(brush, "use_smooth_pressure", text="Pen Pressure Smooth")
+ col.prop(brush, "use_simulate_pressure", text="Simulate Pressure")
- # Tilt
+ if brush.use_smooth_pressure:
+ col.prop(brush, "smooth_pressure_factor", text="Smooth", slider=True)
- col.label("Tilt:")
- col.prop(brush, "stroke_tilt_method", text="")
+ #if brush.use_simulate_pressure:
+ # sub = col.column(align=True)
+ # sub.prop(brush, "simulate_pressure_start", text="Start", slider=True)
+ # sub.prop(brush, "simulate_pressure_fade", text="Fade", slider=True)
- if db:
- col.prop(brush, "use_tilt", text="Tilt")
+ # Pressure Jitter
+ if brush.use_pen_pressure or brush.use_simulate_pressure:
+ row = col.row(align=True)
+ row.prop(brush, "use_jitter_pressure", text="", icon="RNDCURVE")
+ sub = row.row(align=True)
+ sub.active = brush.use_jitter_pressure
+ sub.prop(brush, "jitter_pressure", "Jitter", slider=True)
+ sub.prop(brush, "use_pressure_jitter_pressure", text="")
- if brush.use_tilt:
- # Tilt Smooth
- row = col.row(align=True)
- row.prop(brush, "use_smooth_tilt", text="", icon="SMOOTHCURVE")
- sub = row.row(align=True)
- sub.active = brush.use_smooth_tilt
- sub.prop(brush, "smooth_tilt_factor", text="Smooth", slider=True)
- # Tilt Snap
- row = col.row(align=True)
- row.prop(brush, "use_snap_tilt", text="")
- sub = row.row(align=True)
- sub.active = brush.use_snap_tilt
- sub.prop(brush, "snap_tilt", text="Snap", slider=False)
+ # Tilt
- # Tilt Jitter
- row = col.row(align=True)
- row.prop(brush, "use_jitter_tilt", text="", icon="RNDCURVE")
- sub = row.row(align=True)
- sub.active = brush.use_jitter_tilt
- sub.prop(brush, "jitter_tilt", "Jitter", slider=True)
- sub.prop(brush, "use_pressure_jitter_tilt", text="")
+ col.label("Tilt:")
+ col.prop(brush, "stroke_tilt_method", text="")
-
- # Rake
-
- if not brush.use_anchored_stroke:
- col.label("Rake:")
- col.prop(brush, "stroke_rake_method", text="")
-
if db:
- col.prop(brush, "use_rake", text="Rake")
+ col.prop(brush, "use_tilt", text="Tilt")
- if brush.use_rake:
- if not brush.use_smooth_stroke:
- col.prop(brush, "rake_dead_zone", "Dead-Zone", slider=False)
-
- # Rake Smooth
+ if brush.use_tilt:
+ # Tilt Smooth
row = col.row(align=True)
- row.prop(brush, "use_smooth_rake", text="", icon="SMOOTHCURVE")
+ row.prop(brush, "use_smooth_tilt", text="", icon="SMOOTHCURVE")
sub = row.row(align=True)
- sub.active = brush.use_smooth_rake
- sub.prop(brush, "smooth_rake_factor", text="Smooth", slider=True)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list