Merge with 2.5 -r 21756:22173.
[blender.git] / release / ui / buttons_data_empty.py
index 94caa4ed700551f5c800e1456447e3c4d6edab88..09868eeb542802f1834b93c28e84a85a864b73da 100644 (file)
@@ -7,16 +7,15 @@ class DataButtonsPanel(bpy.types.Panel):
        __context__ = "data"
        
        def poll(self, context):
-               ob = context.active_object
-               return (ob and ob.type == 'EMPTY')
+               return (context.object.type == 'EMPTY')
        
 class DATA_PT_empty(DataButtonsPanel):
-       __idname__ = "DATA_PT_empty"
        __label__ = "Empty"
 
        def draw(self, context):
-               ob = context.active_object
                layout = self.layout
+               
+               ob = context.object
 
                layout.itemR(ob, "empty_draw_type")
                layout.itemR(ob, "empty_draw_size")