Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-11-24 22:55:26 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-04-20 13:11:05 +0300
commita9001adbb45c5774341fa2e8aa81006326a9cd82 (patch)
treecc96dd91d4f1954ededaf88b27e0dbab24703b09 /source/blender/makesdna/DNA_object_types.h
parentdd69a3dbcf1854101765257aea44a02814911137 (diff)
New edit mode for hair.
Conflicts: source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 8bd676caa5e..9cf69ae095e 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -673,6 +673,7 @@ typedef enum ObjectMode {
OB_MODE_TEXTURE_PAINT = 1 << 4,
OB_MODE_PARTICLE_EDIT = 1 << 5,
OB_MODE_POSE = 1 << 6,
+ OB_MODE_HAIR_EDIT = 1 << 7,
} ObjectMode;
/* any mode where the brush system is used */