[Bf-blender-cvs] [fc256d3233d] greasepencil-object: Add TOPBAR context to poll functions

[Antonio Vazquez]

Commit: fc256d3233dca9a2658b8897810721ae176755db
Author: Antonio Vazquez
Date:   Thu May 31 11:06:41 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBfc256d3233dca9a2658b8897810721ae176755db

Add TOPBAR context to poll functions

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

M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/editors/gpencil/gpencil_utils.c

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

diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index c50dd0d0348..996098bf930 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -97,7 +97,9 @@ static int gpencil_primitive_add_poll(bContext *C)
 {
 	/* only 3D view */
 	ScrArea *sa = CTX_wm_area(C);
-	if (sa && sa->spacetype != SPACE_VIEW3D) {
+	if ((sa) && (sa->spacetype != SPACE_VIEW3D) && 
+				(sa->spacetype != SPACE_TOPBAR)) 
+	{
 		return 0;
 	}
 	
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index d0a4dc95c49..b36bdcc24c4 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -101,6 +101,7 @@ bGPdata **ED_gpencil_data_get_pointers_direct(ID *screen_id, ScrArea *sa, Object
 			case SPACE_VIEW3D: /* 3D-View */
 			case SPACE_BUTS: /* properties */
 			case SPACE_INFO: /* header info (needed after workspaces merge) */
+			case SPACE_TOPBAR: /* Topbar (needed after topbar merge) */
 			{
 				/* return obgpencil datablock */
 				if (ob && (ob->type == OB_GPENCIL)) {