[Bf-blender-cvs] [9c2db1455f3] blender2.8: Keymap: group paint modes, reorder enum

[Campbell Barton]

Commit: 9c2db1455f396e0330f81108e1aeca9b7a2d59d0
Author: Campbell Barton
Date:   Wed May 30 13:47:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9c2db1455f396e0330f81108e1aeca9b7a2d59d0

Keymap: group paint modes, reorder enum

Menu now matches the keymap.

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

M	source/blender/editors/object/object_ops.c
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 220668f8a87..3d1a18e1fb1 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -296,8 +296,8 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 			{THREEKEY, OB_MODE_POSE},
 			{THREEKEY, OB_MODE_WEIGHT_PAINT},
 			{FOURKEY, OB_MODE_VERTEX_PAINT},
-			{FIVEKEY, OB_MODE_SCULPT},
-			{SIXKEY, OB_MODE_TEXTURE_PAINT},
+			{FIVEKEY, OB_MODE_TEXTURE_PAINT},
+			{SIXKEY, OB_MODE_SCULPT},
 			{SEVENKEY, OB_MODE_PARTICLE_EDIT},
 		};
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 2bdb0a28fce..f00bf51a3aa 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -65,10 +65,10 @@ const EnumPropertyItem rna_enum_object_mode_items[] = {
 	{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object Mode", ""},
 	{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit Mode", ""},
 	{OB_MODE_POSE, "POSE", ICON_POSE_HLT, "Pose Mode", ""},
-	{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", ""},
-	{OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
 	{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
+	{OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
 	{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
+	{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", ""},
 	{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
 	{OB_MODE_GPENCIL, "GPENCIL_EDIT", ICON_GREASEPENCIL, "Edit Strokes", "Edit Grease Pencil Strokes"},
 	{0, NULL, 0, NULL, NULL}