[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24483] trunk/blender/release/scripts/ui/ space_view3d.py: recent change shows up incorrect context use: context. bone is not valid in the view3d context.

[Campbell Barton]

Revision: 24483
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24483
Author:   campbellbarton
Date:     2009-11-11 11:07:52 +0100 (Wed, 11 Nov 2009)

Log Message:
-----------
recent change shows up incorrect context use: context.bone is not valid in the view3d context.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-11-11 09:59:51 UTC (rev 24482)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-11-11 10:07:52 UTC (rev 24483)
@@ -1381,28 +1381,24 @@
     bl_label = "Item"
 
     def poll(self, context):
-        return (context.active_object or context.bone or context.edit_bone)
+        return (context.active_object or context.active_bone or context.active_pchan)
 
     def draw(self, context):
         layout = self.layout
 
-        ob = context.object
+        ob = context.active_object
 
         row = layout.row()
         row.itemL(text="", icon='ICON_OBJECT_DATA')
         row.itemR(ob, "name", text="")
 
-        if ((context.active_bone or context.active_pchan) and ob.type == 'ARMATURE' and (ob.mode == 'EDIT' or ob.mode == 'POSE')):
+        if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'):
             bone = context.active_bone
-            if not bone:
-                pchan = context.active_pchan
-                if pchan:
-                    bone = pchan.bone
+            if bone:
+                row = layout.row()
+                row.itemL(text="", icon='ICON_BONE_DATA')
+                row.itemR(bone, "name", text="")
 
-            row = layout.row()
-            row.itemL(text="", icon='ICON_BONE_DATA')
-            row.itemR(bone, "name", text="")
-
 class VIEW3D_PT_3dview_display(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'