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, 9 insertions, 5 deletions

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 0b02eee9f7b..1086e77c3f7 100644
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -12,12 +12,16 @@ class DataButtonsPanel(bpy.types.Panel):
 class DATA_PT_skeleton(DataButtonsPanel):
 	__idname__ = "DATA_PT_skeleton"
 	__label__ = "Skeleton"
+	
+	def poll(self, context):
+		return (context.object.type == 'ARMATURE' or context.armature)
 
 	def draw(self, context):
+		layout = self.layout
+		
 		ob = context.object
 		arm = context.armature
 		space = context.space_data
-		layout = self.layout
 
 		split = layout.split(percentage=0.65)
 
@@ -54,8 +58,8 @@ class DATA_PT_display(DataButtonsPanel):
 	__label__ = "Display"
 	
 	def draw(self, context):
-		arm = context.armature
 		layout = self.layout
+		arm = context.armature
 
 		split = layout.split()
 
@@ -74,8 +78,8 @@ class DATA_PT_paths(DataButtonsPanel):
 	__label__ = "Paths"
 
 	def draw(self, context):
-		arm = context.armature
 		layout = self.layout
+		arm = context.armature
 
 		split = layout.split()
 		
@@ -102,8 +106,8 @@ class DATA_PT_ghost(DataButtonsPanel):
 	__label__ = "Ghost"
 
 	def draw(self, context):
-		arm = context.armature
 		layout = self.layout
+		arm = context.armature
 
 		split = layout.split()
 
@@ -123,4 +127,4 @@ class DATA_PT_ghost(DataButtonsPanel):
 bpy.types.register(DATA_PT_skeleton)
 bpy.types.register(DATA_PT_display)
 bpy.types.register(DATA_PT_paths)
-bpy.types.register(DATA_PT_ghost)
+bpy.types.register(DATA_PT_ghost)
\ No newline at end of file