2.5 Buttons:

* Fixed some Bugs from Commit 21458. 

* Show Preview Render only when there is an active id block. 

* Some Code Cleanup (especially in polls). Please try to keep it clean ;-)

1 files changed, 2 insertions, 8 deletions

diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index 00d54aa5b70..e6e870bad5d 100644
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -24,8 +24,8 @@ class DATA_PT_context_lamp(DataButtonsPanel):
 	__label__ = " "
 	
 	def poll(self, context):
-		return ((context.object and context.object.type == 'LAMP') or context.lamp)
-
+		return (context.object.type == 'LAMP')
+		
 	def draw(self, context):
 		layout = self.layout
 		
@@ -42,20 +42,14 @@ class DATA_PT_context_lamp(DataButtonsPanel):
 			split.template_ID(space, "pin_id")
 			split.itemS()
 
-
 class DATA_PT_lamp(DataButtonsPanel):
 	__idname__ = "DATA_PT_lamp"
 	__label__ = "Lamp"
-	
-	def poll(self, context):
-		return ((context.object and context.object.type == 'LAMP') or context.lamp)
 
 	def draw(self, context):
 		layout = self.layout
 		
-		ob = context.object
 		lamp = context.lamp
-		space = context.space_data
 
 		layout.itemR(lamp, "type", expand=True)