[Bf-blender-cvs] [77208a08718] blender-v2.82-release: GPencil: Fix unreported missing annotation popover menu

[Antonio Vazquez]

Commit: 77208a08718f52f14a84a30a0d385321327bbe8a
Author: Antonio Vazquez
Date:   Mon Feb 10 11:55:49 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB77208a08718f52f14a84a30a0d385321327bbe8a

GPencil: Fix unreported missing annotation popover menu

This was introduced when annotations was splited.

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 0759d37e2b8..74a34589a4b 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -143,11 +143,7 @@ class _defs_view3d_generic:
 class _defs_annotate:
 
     def draw_settings_common(context, layout, tool):
-        if type(context.gpencil_data_owner) is bpy.types.Object:
-            gpd = context.scene.grease_pencil
-        else:
-            gpd = context.gpencil_data
-
+        gpd = context.annotation_data
         if gpd is not None:
             if gpd.layers.active_note is not None:
                 text = gpd.layers.active_note
@@ -157,7 +153,7 @@ class _defs_annotate:
             else:
                 text = ""
 
-            gpl = context.active_gpencil_layer
+            gpl = context.active_annotation_layer
             if gpl is not None:
                 layout.label(text="Annotation:")
                 sub = layout.row(align=True)