[Bf-blender-cvs] [85f7f0fddf5] greasepencil-object: Make Annotations toggleable with main overlay switch

[Antonio Vazquez]

Commit: 85f7f0fddf54fa6385b5ae14a74058b4faf70db4
Author: Antonio Vazquez
Date:   Mon Jul 9 10:47:56 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB85f7f0fddf54fa6385b5ae14a74058b4faf70db4

Make Annotations toggleable with main overlay switch

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/draw/intern/draw_manager.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index f6ea5ff5257..a89ec20862e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3893,6 +3893,7 @@ class VIEW3D_PT_overlay(Panel):
         sub.prop(overlay, "show_relationship_lines")
         sub.prop(overlay, "show_motion_paths")
         #sub.prop(overlay, "show_onion_skins")
+        sub.prop(context.space_data, "show_annotation", text="Annotations")
         sub.prop(overlay, "show_face_orientation")
         sub.prop(overlay, "show_backface_culling")
         if shading.type == 'MATERIAL':
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index e455535e2d0..5b49c72ca83 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1247,7 +1247,7 @@ void DRW_draw_render_loop_ex(
 	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
 	RegionView3D *rv3d = ar->regiondata;
-	bool do_annotations = (v3d->flag2 & V3D_SHOW_ANNOTATION) != 0;
+	bool do_annotations = (((v3d->flag2 & V3D_SHOW_ANNOTATION) != 0) && ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0));
 
 	DST.draw_ctx.evil_C = evil_C;
 	DST.viewport = viewport;