[Bf-blender-cvs] [99cc3f81f37] greasepencil-object: Remap mode keymaps and solve merge issue

[Antonio Vazquez]

Commit: 99cc3f81f37d68a6c76f3bf65d2763e46013073c
Author: Antonio Vazquez
Date:   Fri Jun 1 15:35:03 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB99cc3f81f37d68a6c76f3bf65d2763e46013073c

Remap mode keymaps and solve merge issue

The keymap has been changed and there was a merge error.

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

M	source/blender/editors/object/object_edit.c
M	source/blender/editors/object/object_ops.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 0b688b670fa..efd59e5f1ff 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1365,7 +1365,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 				if (mode == OB_MODE_SCULPT) {
 					mode = OB_MODE_GPENCIL_SCULPT;
 				}
-				if (mode == OB_MODE_VERTEX_PAINT) {
+				if (mode == OB_MODE_TEXTURE_PAINT) {
 					mode = OB_MODE_GPENCIL_PAINT;
 				}
 				if (mode == OB_MODE_WEIGHT_PAINT) {
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 3f385d0ef5a..6ef67041716 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -293,11 +293,12 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	{
 		short key_mode_pair[][2] = {
 			{ONEKEY, OB_MODE_OBJECT},
-			{TWOKEY, OB_MODE_EDIT},            /* or OB_MODE_GPENCIL_EDIT */
-			{THREEKEY, OB_MODE_SCULPT},        /* or OB_MODE_GPENCIL_SCULPT */
-			{FOURKEY, OB_MODE_TEXTURE_PAINT},  /* or OB_MODE_POSE */
-			{FIVEKEY, OB_MODE_VERTEX_PAINT},   /* or OB_MODE_GPENCIL_PAINT */
-			{SIXKEY, OB_MODE_WEIGHT_PAINT},    /* or OB_MODE_GPENCIL_WEIGHT */
+			{TWOKEY, OB_MODE_EDIT},				/* or OB_MODE_GPENCIL_EDIT */
+			{THREEKEY, OB_MODE_POSE},
+			{THREEKEY, OB_MODE_WEIGHT_PAINT},	/* or OB_MODE_GPENCIL_WEIGHT */
+			{FOURKEY, OB_MODE_VERTEX_PAINT},
+			{FIVEKEY, OB_MODE_TEXTURE_PAINT},	/* or OB_MODE_GPENCIL_PAINT */
+			{SIXKEY, OB_MODE_SCULPT},			/* or OB_MODE_GPENCIL_SCULPT */
 			{SEVENKEY, OB_MODE_PARTICLE_EDIT},
 		};