From 795c4a3462536d1e780b227d6877a8693f656cf9 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Mon, 10 Feb 2020 11:55:49 +0100 Subject: [PATCH] GPencil: Fix unreported missing annotation popover menu This was introduced when annotations was splited. --- release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index c1ad196b555..13b8dced08c 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -144,11 +144,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 @@ -158,7 +154,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)