archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Keymap: group paint modes, reorder enum

Browse Source 
Menu now matches the keymap.
This commit is contained in:
Campbell Barton
2018-05-30 13:47:24 +02:00
parent eb24c9a1e1
commit 9c2db1455f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/object/object_ops.c
View File

@@ -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},
};

4
source/blender/makesrna/intern/rna_object.c
View File

@@ -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}