diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
| commit | 15ad39e6848ea54da8a3f36b867f8b09a7b8b163 (patch) | |
| tree | 53e4f1c2f37d0e2f3679e284a8f7c0f3f66f6d5c /source/blender/makesdna/DNA_meshdata_types.h | |
| parent | ce6487291349b00a85f265d2b8cfb682e2bb8086 (diff) | |
| parent | 1936b31cd0f7741ec39f638cc57286e5b379134c (diff) | |
svn merge ^/trunk/blender -r42303:42329
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index c4fb1c9b33a..210fd7b0e38 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -225,8 +225,8 @@ typedef struct MRecast{ /* reserve 16 for ME_HIDE */ #define ME_EDGERENDER (1<<5) #define ME_LOOSEEDGE (1<<7) -#define ME_SEAM_LAST (1<<8) -#define ME_SHARP (1<<9) +/* #define ME_SEAM_LAST (1<<8) */ /* UNUSED */ +#define ME_SHARP (1<<9) /* only reason this flag remains a 'short' */ /* puno = vertexnormal (mface) */ /* render assumes flips to be ordered like this */ |