diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-18 23:01:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-18 23:01:26 +0400 |
| commit | 5f9ea0d7eb675dceb5ef981d0bbe221237a3c6fc (patch) | |
| tree | 20cd4b5f5ca810e7a96a4b0a3650f4a39a5f9e4d /source/blender/makesdna | |
| parent | a08a3ab931f334dcaa3d32fe80d848e8dd1a315b (diff) | |
move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 0c708ddcbef..f2ee73392c7 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -186,7 +186,7 @@ typedef struct TFace { #define ME_DRAWNORMALS (1 << 2) #define ME_DRAW_VNORMALS (1 << 3) -#define ME_ALLEDGES (1 << 4) +// #define ME_ALLEDGES (1 << 4) #define ME_HIDDENEDGES (1 << 5) #define ME_DRAWCREASES (1 << 6) diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 559ba446740..9fa35cd667c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -218,10 +218,8 @@ typedef struct Object { char boundtype; /* bounding box use for drawing */ char collision_boundtype; /* bounding box type used for collision */ - char restrictflag; /* for restricting view, select, render etc. accessible in outliner */ - + short dtx; /* viewport draw extra settings */ char dt; /* viewport draw type */ - char dtx; /* viewport draw extra settings */ char empty_drawtype; float empty_drawsize; float dupfacesca; /* dupliface scale */ @@ -241,8 +239,9 @@ typedef struct Object { struct BulletSoftBody *bsoft; /* settings for game engine bullet soft body */ + char restrictflag; /* for restricting view, select, render etc. accessible in outliner */ + char recalc; /* dependency flag */ short softflag; /* softbody settings */ - short recalc; /* dependency flag */ float anisotropicFriction[3]; ListBase constraints; /* object constraints */ @@ -406,17 +405,19 @@ typedef struct DupliObject { #define OB_PAINT 100 /* temporary used in draw code */ -/* dtx: flags, char! */ -#define OB_AXIS 2 -#define OB_TEXSPACE 4 -#define OB_DRAWNAME 8 -#define OB_DRAWIMAGE 16 +/* dtx: flags (short) */ +#define OB_DRAWBOUNDOX (1 << 0) +#define OB_AXIS (1 << 1) +#define OB_TEXSPACE (1 << 2) +#define OB_DRAWNAME (1 << 3) +#define OB_DRAWIMAGE (1 << 4) /* for solid+wire display */ -#define OB_DRAWWIRE 32 - /* for overdraw */ -#define OB_DRAWXRAY 64 +#define OB_DRAWWIRE (1 << 5) + /* for overdraw s*/ +#define OB_DRAWXRAY (1 << 6) /* enable transparent draw */ -#define OB_DRAWTRANSP 128 +#define OB_DRAWTRANSP (1 << 7) +#define OB_DRAW_ALL_EDGES (1 << 8) /* only for meshes currently */ /* empty_drawtype: no flags */ #define OB_ARROWS 1 |