[Bf-blender-cvs] [5f4d2be7352] blender2.8: GP: Hide dummy and cursor in drawing mode

[Antonioya]

Commit: 5f4d2be7352963f48add549dadd33724d3aa83dd
Author: Antonioya
Date:   Wed Oct 3 20:25:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5f4d2be7352963f48add549dadd33724d3aa83dd

GP: Hide dummy and cursor in drawing mode

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

M	source/blender/draw/intern/draw_view.c
M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 31a79bcda94..0444e298044 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -165,6 +165,11 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie
 		return false;
 	}
 
+	/* grease pencil draw mode hide always */
+	if ((ob) && (ob->mode == OB_MODE_GPENCIL_PAINT)) {
+		return false;
+	}
+
 	return true;
 }
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 2c1dc47a48c..aa42320afde 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2753,6 +2753,12 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 			DRW_shgroup_empty(sgl, ob, view_layer);
 			break;
 		case OB_GPENCIL:
+			/* in draw mode hide always */
+			if ((OBACT(view_layer)) &&
+				(OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT))
+			{
+				break;
+			}
 			if (hide_object_extra) {
 				break;
 			}