Cleanup: simplify poll function

1 files changed, 4 insertions, 4 deletions

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index b62b251163e..282f8d77515 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -102,14 +102,14 @@ class MATERIAL_PT_gpencil_surface(GPMaterialButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         ob = context.object
-        if ob is None:
+        if not (ob and ob.type == 'GPENCIL'):
             return False
 
-        ma = context.object.active_material
-        if ma is None or ma.grease_pencil is None:
+        ma = ob.active_material
+        if not (ma and ma.grease_pencil):
             return False
 
-        return ob.type == 'GPENCIL'
+        return True
 
     def draw_header_preset(self, context):
         MATERIAL_PT_gpencil_material_presets.draw_panel_header(self.layout)