[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23034] branches/blender2.5/blender/ release/ui/space_view3d_toolbar.py: 2.5/Paint:

Nicholas Bishop nicholasbishop at gmail.com
Sun Sep 6 18:58:16 CEST 2009


Revision: 23034
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23034
Author:   nicholasbishop
Date:     2009-09-06 18:58:14 +0200 (Sun, 06 Sep 2009)

Log Message:
-----------
2.5/Paint:

* Fixed some bad UI pointed out by letterrip. People had made some quite bad changes (duplicating buttons, adding UI for non-existent features, even deleting UI for existing features!)

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_view3d_toolbar.py

Modified: branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-09-06 15:23:50 UTC (rev 23033)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-09-06 16:58:14 UTC (rev 23034)
@@ -342,9 +342,6 @@
 			
 				col = layout.column()
 
-				if brush.sculpt_tool != 'LAYER':
-					col.itemR(brush, "anchored")
-
 				if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
 					col.itemR(brush, "flip_direction")
 
@@ -352,8 +349,6 @@
 					col.itemR(brush, "persistent")
 					col.itemO("sculpt.set_persistent_base")
 
-				col.itemR(brush, "rake")
-
 			col.itemR(brush, "sculpt_tool")
 				
 		# Texture Paint Mode #
@@ -426,25 +421,30 @@
 		brush = settings.brush
 		texture_paint = context.texture_paint_object
 
+		if context.sculpt_object:
+			if brush.sculpt_tool != 'LAYER':
+				layout.itemR(brush, "anchored")
+			layout.itemR(brush, "rake")
+
+		layout.itemR(brush, "airbrush")
+		col = layout.column()
+		col.active = brush.airbrush
+		col.itemR(brush, "rate", slider=True)
+
 		if not texture_paint:
 			layout.itemR(brush, "smooth_stroke")
 			col = layout.column()
-			col.itemR(brush, "airbrush")
-			col.itemR(brush, "anchored")
-			col.itemR(brush, "rake")
+			col.active = brush.smooth_stroke
+			col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True)
+			col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True)
 
 		layout.itemR(brush, "space")
 		row = layout.row(align=True)
 		row.active = brush.space
 		row.itemR(brush, "spacing", text="Distance", slider=True)
 		if texture_paint:
-			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
+			row.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")	
 
-		layout.itemR(brush, "airbrush")
-		col = layout.column()
-		col.active = brush.airbrush
-		col.itemR(brush, "rate", slider=True)
-
 class VIEW3D_PT_tools_brush_curve(PaintPanel):
 	__label__ = "Curve"
 	__default_closed__ = True





More information about the Bf-blender-cvs mailing list