diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 06:19:54 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 06:19:54 +0400 |
| commit | 9f243d531cb2629625d02e4290549b9e6ba76933 (patch) | |
| tree | c2ade62118995bb82bac30eb9efb874bbd4b286a /source/blender/makesdna/DNA_mesh_types.h | |
| parent | 7eae1db0597a2a82f86139c0069a2d4ff413837b (diff) | |
| parent | 89a5cf40e362756d92b440152c41e376feadad59 (diff) | |
Merged changes in the trunk up to revision 44288.
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index f422e80b864..a5adc8c200a 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -143,7 +143,7 @@ typedef struct TFace { /* **************** MESH ********************* */ /* texflag */ -#define AUTOSPACE 1 +#define ME_AUTOSPACE 1 /* me->editflag */ #define ME_EDIT_MIRROR_X (1 << 0) @@ -232,4 +232,7 @@ typedef struct TFace { #define USE_BMESH_SAVE_WITHOUT_MFACE +/* enable this so meshes get tessfaces calculated by default */ +// #define USE_TESSFACE_DEFAULT + #endif |