[Bf-blender-cvs] [204ad852a64] blender2.8: GP: Hide different UI elements depending of mode

[Antonioya]

Commit: 204ad852a64072f008050b66e65ff197258ffa2e
Author: Antonioya
Date:   Wed Oct 3 22:56:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB204ad852a64072f008050b66e65ff197258ffa2e

GP: Hide different UI elements depending of mode

The 3D Cursor, origin and dummy are hidden depending of the mode to get a cleaner drawing space.

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

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 0444e298044..0c0aab7bec3 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -165,8 +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)) {
+	/* grease pencil hide always in some modes */
+	if ((ob) &&
+		((ob->mode == OB_MODE_GPENCIL_PAINT) ||
+		 (ob->mode == OB_MODE_GPENCIL_WEIGHT)))
+	{
 		return false;
 	}
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 5ba576985af..3b95f0b86d0 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2374,9 +2374,11 @@ static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob, ViewL
 		return;
 	}
 
-	/* grease pencil in draw mode hide always */
+	/* grease pencil in some modes hide always */
 	if ((OBACT(view_layer)) &&
-		(OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT))
+		((OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT) ||
+		 (OBACT(view_layer)->mode == OB_MODE_GPENCIL_SCULPT) ||
+		 (OBACT(view_layer)->mode == OB_MODE_GPENCIL_WEIGHT)))
 	{
 		return;
 	}
@@ -2760,9 +2762,9 @@ 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 */
+			/* in all modes except object mode hide always */
 			if ((OBACT(view_layer)) &&
-				(OBACT(view_layer)->mode == OB_MODE_GPENCIL_PAINT))
+				(OBACT(view_layer)->mode != OB_MODE_OBJECT))
 			{
 				break;
 			}