diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
| commit | ff5fa0df18b6f03f5c9412756b001b19ac36585e (patch) | |
| tree | ec38b9b56845aadf265d9bf6ca3f3cd701a59fc6 /source/blender/makesrna/intern/rna_object.c | |
| parent | 62b139385a1a4c59dc966b4ffdfe0c6e1fb92690 (diff) | |
| parent | bf7e8b42fa269c310e456fa55263ff2d9849804e (diff) | |
Merge branch 'strand_editmode' into alembic
Conflicts:
source/blender/editors/space_view3d/drawstrands.c
source/blender/editors/space_view3d/view3d_intern.h
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2fdbea3973c..faeed8719b3 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -70,6 +70,7 @@ EnumPropertyItem object_mode_items[] = { {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""}, {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""}, {OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""}, + {OB_MODE_HAIR_EDIT, "HAIR_EDIT", ICON_PARTICLEMODE, "Hair Edit", ""}, {0, NULL, 0, NULL, NULL} }; |