[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23337] trunk/blender/release/ui: UI: fix some python errors in sculpt/paint modes when there is no brush.

[Brecht Van Lommel]

Revision: 23337
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23337
Author:   blendix
Date:     2009-09-18 17:52:28 +0200 (Fri, 18 Sep 2009)

Log Message:
-----------
UI: fix some python errors in sculpt/paint modes when there is no brush.

Modified Paths:
--------------
    trunk/blender/release/ui/space_image.py
    trunk/blender/release/ui/space_view3d_toolbar.py

Modified: trunk/blender/release/ui/space_image.py
===================================================================
--- trunk/blender/release/ui/space_image.py	2009-09-18 15:48:49 UTC (rev 23336)
+++ trunk/blender/release/ui/space_image.py	2009-09-18 15:52:28 UTC (rev 23337)
@@ -419,22 +419,23 @@
 		row.item_enumR(settings, "tool", 'CLONE')
 		row.item_enumR(settings, "tool", 'SMEAR')
 			
-		col = layout.column()
-		col.itemR(brush, "color", text="")
+		if brush:
+			col = layout.column()
+			col.itemR(brush, "color", text="")
 
-		row = col.row(align=True)
-		row.itemR(brush, "size", slider=True)
-		row.itemR(brush, "use_size_pressure", toggle=True, text="")
-		
-		row = col.row(align=True)
-		row.itemR(brush, "strength", slider=True)
-		row.itemR(brush, "use_strength_pressure", toggle=True, text="")
+			row = col.row(align=True)
+			row.itemR(brush, "size", slider=True)
+			row.itemR(brush, "use_size_pressure", toggle=True, text="")
+			
+			row = col.row(align=True)
+			row.itemR(brush, "strength", slider=True)
+			row.itemR(brush, "use_strength_pressure", toggle=True, text="")
 
-		row = col.row(align=True)
-		row.itemR(brush, "jitter", slider=True)
-		row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
+			row = col.row(align=True)
+			row.itemR(brush, "jitter", slider=True)
+			row.itemR(brush, "use_jitter_pressure", toggle=True, text="")
 
-		col.itemR(brush, "blend", text="Blend")
+			col.itemR(brush, "blend", text="Blend")
 
 class IMAGE_PT_paint_stroke(bpy.types.Panel):
 	__space_type__ = 'IMAGE_EDITOR'
@@ -444,7 +445,8 @@
 
 	def poll(self, context):
 		sima = context.space_data
-		return sima.show_paint
+		settings = context.tool_settings.image_paint
+		return sima.show_paint and settings.brush
 
 	def draw(self, context):
 		layout = self.layout
@@ -471,7 +473,8 @@
 
 	def poll(self, context):
 		sima = context.space_data
-		return sima.show_paint
+		settings = context.tool_settings.image_paint
+		return sima.show_paint and settings.brush
 
 	def draw(self, context):
 		layout = self.layout

Modified: trunk/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/ui/space_view3d_toolbar.py	2009-09-18 15:48:49 UTC (rev 23336)
+++ trunk/blender/release/ui/space_view3d_toolbar.py	2009-09-18 15:52:28 UTC (rev 23337)
@@ -379,7 +379,7 @@
 
 		# Sculpt Mode #
 
-		elif context.sculpt_object and settings.brush:
+		elif context.sculpt_object and brush:
 			col = layout.column()
 			col.itemS()
 			col.itemR(brush, "sculpt_tool", expand=True)
@@ -412,7 +412,7 @@
 				
 		# Texture Paint Mode #
 		
-		elif context.texture_paint_object:
+		elif context.texture_paint_object and brush:
 			col = layout.column(align=True)
 			col.item_enumR(settings, "tool", 'DRAW')
 			col.item_enumR(settings, "tool", 'SOFTEN')
@@ -438,7 +438,7 @@
 		
 		# Weight Paint Mode #
 	
-		elif context.weight_paint_object:
+		elif context.weight_paint_object and brush:
 			layout.itemR(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
 			
 			col = layout.column()
@@ -456,7 +456,7 @@
 		
 		# Vertex Paint Mode #
 		
-		elif context.vertex_paint_object:
+		elif context.vertex_paint_object and brush:
 			col = layout.column()
 			col.itemR(brush, "color", text="")