[Bf-blender-cvs] [538c74a9497] hair_object: Add missing context attributes for hair edit mode.

[Lukas Toenne]

Commit: 538c74a9497c1eb9912e48d3aa3b8784eca53872
Author: Lukas Toenne
Date:   Mon Dec 17 15:35:59 2018 +0000
Branches: hair_object
https://developer.blender.org/rB538c74a9497c1eb9912e48d3aa3b8784eca53872

Add missing context attributes for hair edit mode.

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

M	source/blender/editors/space_buttons/space_buttons.c
M	source/blender/makesrna/intern/rna_context.c
M	source/blender/windowmanager/intern/wm_keymap_utils.c

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

diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 1f1f238daf6..1d9372320c5 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -237,6 +237,9 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar)
 			case CTX_MODE_EDIT_LATTICE:
 				ARRAY_SET_ITEMS(contexts, ".lattice_edit");
 				break;
+			case CTX_MODE_EDIT_HAIR:
+				ARRAY_SET_ITEMS(contexts, ".hair_edit");
+				break;
 			case CTX_MODE_POSE:
 				ARRAY_SET_ITEMS(contexts, ".posemode");
 				break;
diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c
index 618cefe13e5..e250d4bb08c 100644
--- a/source/blender/makesrna/intern/rna_context.c
+++ b/source/blender/makesrna/intern/rna_context.c
@@ -46,6 +46,7 @@ const EnumPropertyItem rna_enum_context_mode_items[] = {
 	{CTX_MODE_EDIT_ARMATURE, "EDIT_ARMATURE", 0, "Armature Edit", ""}, /* PARSKEL reuse will give issues */
 	{CTX_MODE_EDIT_METABALL, "EDIT_METABALL", 0, "Metaball Edit", ""},
 	{CTX_MODE_EDIT_LATTICE, "EDIT_LATTICE", 0, "Lattice Edit", ""},
+	{CTX_MODE_EDIT_HAIR, "EDIT_HAIR", 0, "Hair Edit", ""},
 	{CTX_MODE_POSE, "POSE", 0, "Pose ", ""},
 	{CTX_MODE_SCULPT, "SCULPT", 0, "Sculpt", ""},
 	{CTX_MODE_PAINT_WEIGHT, "PAINT_WEIGHT", 0, "Weight Paint", ""},
diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.c b/source/blender/windowmanager/intern/wm_keymap_utils.c
index 70e6b236b34..9e6a5ebc7f0 100644
--- a/source/blender/windowmanager/intern/wm_keymap_utils.c
+++ b/source/blender/windowmanager/intern/wm_keymap_utils.c
@@ -116,6 +116,7 @@ wmKeyMap *WM_keymap_guess_from_context(const bContext *C)
 			case CTX_MODE_EDIT_ARMATURE:        km_id = "Armature"; break;
 			case CTX_MODE_EDIT_METABALL:        km_id = "Metaball"; break;
 			case CTX_MODE_EDIT_LATTICE:         km_id = "Lattice"; break;
+			case CTX_MODE_EDIT_HAIR:            km_id = "Hair"; break;
 			case CTX_MODE_POSE:                 km_id = "Pose"; break;
 			case CTX_MODE_SCULPT:               km_id = "Sculpt"; break;
 			case CTX_MODE_PAINT_WEIGHT:         km_id = "Weight Paint"; break;