diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 12:33:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 12:33:19 +0400 |
commit | 8de51d37364e5513523c74fb0435bf256104e88b (patch) | |
tree | 68b12a13313c5f60dec7de0ff76d6ce67d1e28d9 /source/blender/makesdna/DNA_meshdata_types.h | |
parent | dab41e04992941879f27ae9b402fc94c16d21389 (diff) |
reduce size of typemap, and minor changes to sync with trunk
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index eefa2278472..bab9d84bb0c 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -91,13 +91,13 @@ typedef struct MLoop { unsigned int e; /*edge index*/ } MLoop; -typedef struct MTexPoly{ +typedef struct MTexPoly { struct Image *tpage; char flag, transp; short mode,tile,unwrap; }MTexPoly; -typedef struct MLoopUV{ +typedef struct MLoopUV { float uv[2]; int flag; }MLoopUV; @@ -109,7 +109,7 @@ typedef struct MLoopUV{ /* at the moment alpha is abused for vertex painting * and not used for transparency, note that red and blue are swapped */ -typedef struct MLoopCol{ +typedef struct MLoopCol { char a, r, g, b; } MLoopCol; @@ -134,10 +134,10 @@ typedef struct MTFace { typedef struct MFloatProperty{ float f; } MFloatProperty; -typedef struct MIntProperty{ +typedef struct MIntProperty { int i; } MIntProperty; -typedef struct MStringProperty{ +typedef struct MStringProperty { char s[256]; } MStringProperty; @@ -237,7 +237,6 @@ typedef struct MRecast{ #define ME_SMOOTH 1 #define ME_FACE_SEL 2 /* flag ME_HIDE==16 is used here too */ -#define ME_DRAW_ACT 4 #define ME_POLY_LOOP_PREV(mloop, mp, i) (&(mloop)[(mp)->loopstart + (((i) + (mp)->totloop - 1) % (mp)->totloop)]) #define ME_POLY_LOOP_NEXT(mloop, mp, i) (&(mloop)[(mp)->loopstart + (((i) + 1) % (mp)->totloop)]) |