diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
| commit | 5524ed9ba2d60331abed47c9df0bc2fcf330b36b (patch) | |
| tree | e8380010f140f022b77236af171d97083a294006 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (diff) | |
| parent | 689f3aa174ff795044a4dab719edf60b7b1f5bd3 (diff) | |
Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index df8b423fcad..85bb58a2017 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -199,9 +199,10 @@ typedef struct TFace { #define ME_DRAWEXTRA_EDGELEN (1 << 10) #define ME_DRAWEXTRA_FACEAREA (1 << 11) #define ME_DRAWEXTRA_FACEANG (1 << 12) +#define ME_DRAWEXTRA_EDGEANG (1 << 13) /* debug only option */ -#define ME_DRAWEXTRA_INDICES (1 << 13) +#define ME_DRAWEXTRA_INDICES (1 << 14) #define ME_DRAW_FREESTYLE_EDGE (1 << 14) #define ME_DRAW_FREESTYLE_FACE (1 << 15) |