[Bf-blender-cvs] [007b43dcb39] greasepencil-object: Fix more issues raised in code review

[Joshua Leung]

Commit: 007b43dcb396b8ff85f7878b8be4eb04ecde0a43
Author: Joshua Leung
Date:   Wed Oct 25 00:46:49 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB007b43dcb396b8ff85f7878b8be4eb04ecde0a43

Fix more issues raised in code review

===================================================================

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/properties_material_gpencil.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index b07066331d3..f45195fa5f5 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -515,7 +515,7 @@ class GreasePencilAppearancePanel:
             return False
 
         is_gpmode = context.active_object and \
-                    context.active_object.mode in ('GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT')
+                    context.active_object.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT'}
         return is_gpmode
 
     @staticmethod
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 16745510c09..b20ec2e5305 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -35,16 +35,6 @@ class GPENCIL_UL_paletteslots(UIList):
             layout.label(text="", icon_value=icon)
 
 
-class MaterialButtonsPanel:
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = "material"
-
-    @classmethod
-    def poll(cls, context):
-        return context.object and context.object.type == 'GPENCIL'
-
-
 class MATERIAL_PT_gpencil_palette_slots(Panel):
     bl_label = "Palette Slots"
     bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 3b119ea6ea4..a8a26833008 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1,4 +1,3 @@
-
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #  This program is free software; you can redistribute it and/or