[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23057] branches/blender2.5/blender/ release/ui/space_view3d_toolbar.py: Re-commit previous brush ui changes.

[Matt Ebb]

Revision: 23057
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23057
Author:   broken
Date:     2009-09-08 05:29:28 +0200 (Tue, 08 Sep 2009)

Log Message:
-----------
Re-commit previous brush ui changes.

Strangely seemed to get reverted in jahka's rev. 22861

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-08 03:25:00 UTC (rev 23056)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-09-08 03:29:28 UTC (rev 23057)
@@ -357,10 +357,8 @@
 			col = layout.column(align=True)
 			col.item_enumR(settings, "tool", 'DRAW')
 			col.item_enumR(settings, "tool", 'SOFTEN')
-			if settings.use_projection:
-				col.item_enumR(settings, "tool", 'CLONE')
-			else:
-				col.item_enumR(settings, "tool", 'SMEAR')
+			col.item_enumR(settings, "tool", 'CLONE')
+			col.item_enumR(settings, "tool", 'SMEAR')
 				
 			col = layout.column()
 			col.itemR(brush, "color", text="")
@@ -546,10 +544,18 @@
 
 # ********** default tools for texturepaint ****************
 
-class VIEW3D_PT_tools_texturepaint(View3DPanel):
-	__context__ = "texturepaint"
-	__label__ = "Options"
+class VIEW3D_PT_tools_projectpaint(View3DPanel):
+	__context__ = "projectpaint"
+	__label__ = "Project Paint"
 
+	def poll(self, context): 	 
+		return context.tool_settings.image_paint.tool != 'SMEAR' 	 
+
+	def draw_header(self, context): 	 
+		layout = self.layout 	 
+		ipaint = context.tool_settings.image_paint 	 
+		layout.itemR(ipaint, "use_projection", text="")
+
 	def draw(self, context):
 		layout = self.layout
 		
@@ -558,7 +564,6 @@
 		use_projection= ipaint.use_projection
 		
 		col = layout.column()
-		col.itemR(ipaint, "use_projection")
 		sub = col.column()
 		sub.active = use_projection
 		sub.itemR(ipaint, "use_occlude")
@@ -670,5 +675,5 @@
 bpy.types.register(VIEW3D_PT_sculpt_options)
 bpy.types.register(VIEW3D_PT_tools_vertexpaint)
 bpy.types.register(VIEW3D_PT_tools_weightpaint)
-bpy.types.register(VIEW3D_PT_tools_texturepaint)
+bpy.types.register(VIEW3D_PT_tools_projectpaint)
 bpy.types.register(VIEW3D_PT_tools_particlemode)