diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-24 22:55:26 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-20 13:11:05 +0300 |
| commit | a9001adbb45c5774341fa2e8aa81006326a9cd82 (patch) | |
| tree | cc96dd91d4f1954ededaf88b27e0dbab24703b09 /source/blender/blenkernel/intern/context.c | |
| parent | dd69a3dbcf1854101765257aea44a02814911137 (diff) | |
New edit mode for hair.
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 7142c092583..4aeb3af60ae 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -926,6 +926,7 @@ int CTX_data_mode_enum(const bContext *C) else if (ob->mode & OB_MODE_VERTEX_PAINT) return CTX_MODE_PAINT_VERTEX; else if (ob->mode & OB_MODE_TEXTURE_PAINT) return CTX_MODE_PAINT_TEXTURE; else if (ob->mode & OB_MODE_PARTICLE_EDIT) return CTX_MODE_PARTICLE; + else if (ob->mode & OB_MODE_HAIR_EDIT) return CTX_MODE_HAIR; } } @@ -949,6 +950,7 @@ static const char *data_mode_strings[] = { "vertexpaint", "imagepaint", "particlemode", + "hairmode", "objectmode", NULL }; |