Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-10 13:55:49 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-10 18:21:54 +0300
commit77208a08718f52f14a84a30a0d385321327bbe8a (patch)
tree1dea2473ac57e5038efed004e22934cb6d0ea8b9
parent36b7f5d27e7aec2300d0c9f44f724c479769eb98 (diff)
GPencil: Fix unreported missing annotation popover menu
This was introduced when annotations was splited.
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py8
1 files 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 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)