2.5 Buttons:

* Added more material buttons by William. Thanks.
I made some minor adjustments and added Specular Shader Model RNA. 

* Code cleanup and some consistency tweaks of button files.
Notes: Preview render now only shows up when there is an active world, material, texture or lamp.
* Made sure initial panels with ID Datablocks are shown, even when no block is active. 

1 files changed, 11 insertions, 19 deletions

diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 13b7f6a8dee..1252b9f8c17 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -10,10 +10,8 @@ class RENDER_PT_shading(RenderButtonsPanel):
 	__label__ = "Shading"
 
 	def draw(self, context):
-		scene = context.scene
 		layout = self.layout
-
-		rd = scene.render_data
+		rd = context.scene.render_data
 		
 		split = layout.split()
 		
@@ -34,10 +32,8 @@ class RENDER_PT_output(RenderButtonsPanel):
 	__label__ = "Output"
 
 	def draw(self, context):
-		scene = context.scene
 		layout = self.layout
-
-		rd = scene.render_data
+		rd = context.scene.render_data
 		
 		layout.itemR(rd, "output_path")
 		
@@ -133,16 +129,15 @@ class RENDER_PT_antialiasing(RenderButtonsPanel):
 	__label__ = "Anti-Aliasing"
 
 	def draw_header(self, context):
+		layout = self.layout
 		rd = context.scene.render_data
 
-		layout = self.layout
 		layout.itemR(rd, "antialiasing", text="")
 
 	def draw(self, context):
-		scene = context.scene
-		rd = scene.render_data
-
 		layout = self.layout
+		rd = context.scene.render_data
+
 		layout.active = rd.antialiasing
 
 		split = layout.split()
@@ -163,10 +158,8 @@ class RENDER_PT_render(RenderButtonsPanel):
 	__label__ = "Render"
 
 	def draw(self, context):
-		scene = context.scene
 		layout = self.layout
-
-		rd = scene.render_data
+		rd = context.scene.render_data
 
 		row = layout.row()
 		row.itemO("SCREEN_OT_render", text="Render Still", icon=109)
@@ -204,9 +197,9 @@ class RENDER_PT_dimensions(RenderButtonsPanel):
 	__label__ = "Dimensions"
 
 	def draw(self, context):
-		scene = context.scene
 		layout = self.layout
-
+		
+		scene = context.scene
 		rd = scene.render_data
 		
 		split = layout.split()
@@ -248,10 +241,9 @@ class RENDER_PT_stamp(RenderButtonsPanel):
 		layout.itemR(rd, "stamp", text="")
 
 	def draw(self, context):
-		scene = context.scene
-		rd = scene.render_data
-
 		layout = self.layout
+		rd = context.scene.render_data
+
 		layout.active = rd.stamp
 
 		split = layout.split()
@@ -282,4 +274,4 @@ bpy.types.register(RENDER_PT_dimensions)
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
 bpy.types.register(RENDER_PT_output)
-bpy.types.register(RENDER_PT_stamp)
+bpy.types.register(RENDER_PT_stamp)
\ No newline at end of file