[Bf-blender-cvs] [2d65b34f163] greasepencil-object: Add new context modes for grease pencil

[Antonio Vazquez]

Commit: 2d65b34f163207fbd9fdfbaa4f3312f29fe4d6a3
Author: Antonio Vazquez
Date:   Wed May 30 20:15:53 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2d65b34f163207fbd9fdfbaa4f3312f29fe4d6a3

Add new context modes for grease pencil

These modes were missing.

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

M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/draw/intern/draw_manager.c
M	source/blender/makesrna/intern/rna_context.c

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

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 615ca223a0e..7337b88e376 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -118,6 +118,10 @@ enum {
 	CTX_MODE_PAINT_TEXTURE,
 	CTX_MODE_PARTICLE,
 	CTX_MODE_OBJECT,
+	CTX_MODE_GPENCIL_PAINT,
+	CTX_MODE_GPENCIL_EDIT,
+	CTX_MODE_GPENCIL_SCULPT,
+	CTX_MODE_GPENCIL_WEIGHT,
 	CTX_MODE_NUM /* must be last */
 };
 
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 9fcd59f4db7..39ee6321913 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1006,6 +1006,10 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectM
 			else if (object_mode & OB_MODE_VERTEX_PAINT) return CTX_MODE_PAINT_VERTEX;
 			else if (object_mode & OB_MODE_TEXTURE_PAINT) return CTX_MODE_PAINT_TEXTURE;
 			else if (object_mode & OB_MODE_PARTICLE_EDIT) return CTX_MODE_PARTICLE;
+			else if (object_mode & OB_MODE_GPENCIL_PAINT) return CTX_MODE_GPENCIL_PAINT;
+			else if (object_mode & OB_MODE_GPENCIL_EDIT) return CTX_MODE_GPENCIL_EDIT;
+			else if (object_mode & OB_MODE_GPENCIL_SCULPT) return CTX_MODE_GPENCIL_SCULPT;
+			else if (object_mode & OB_MODE_GPENCIL_WEIGHT) return CTX_MODE_GPENCIL_WEIGHT;
 		}
 	}
 
@@ -1036,6 +1040,10 @@ static const char *data_mode_strings[] = {
 	"imagepaint",
 	"particlemode",
 	"objectmode",
+	"greasepencil_paint",
+	"greasepencil_edit",
+	"greasepencil_sculpt",
+	"greasepencil_weight",
 	NULL
 };
 BLI_STATIC_ASSERT(ARRAY_SIZE(data_mode_strings) == CTX_MODE_NUM + 1, "Must have a string for each context mode")
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 28e9972d546..1d03b3bb5a6 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1098,6 +1098,11 @@ static void drw_engines_enable_from_mode(int mode)
 			break;
 		case CTX_MODE_OBJECT:
 			break;
+		case CTX_MODE_GPENCIL_PAINT:
+		case CTX_MODE_GPENCIL_EDIT:
+		case CTX_MODE_GPENCIL_SCULPT:
+		case CTX_MODE_GPENCIL_WEIGHT:
+			break;
 		default:
 			BLI_assert(!"Draw mode invalid");
 			break;
diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c
index 706dc6a3cd7..f68b4589459 100644
--- a/source/blender/makesrna/intern/rna_context.c
+++ b/source/blender/makesrna/intern/rna_context.c
@@ -52,6 +52,10 @@ const EnumPropertyItem rna_enum_context_mode_items[] = {
 	{CTX_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", 0, "Texture Paint", ""},
 	{CTX_MODE_PARTICLE, "PARTICLE", 0, "Particle", ""},
 	{CTX_MODE_OBJECT, "OBJECT", 0, "Object", ""},
+	{CTX_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", 0, "Grease Pencil Paint", "" },
+	{CTX_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", 0, "Grease Pencil Edit", "" },
+	{CTX_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", 0, "Grease Pencil Sculpt", "" },
+	{CTX_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", 0, "Grease Pencil Weight Paint", "" },
 	{0, NULL, 0, NULL, NULL}
 };