diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-12-05 13:52:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-05 13:52:14 +0300 |
| commit | 8493fa986bfd01c4d7e98d8afbccbfec44f78d5b (patch) | |
| tree | 77381effaf81c4ca8b452d4e7b733792a7f02915 /source/blender/makesdna/DNA_object_types.h | |
| parent | aa39d56692f63cfd9a6d61bbf813e8c570600037 (diff) | |
dont draw face dots when solidtex is enabled - added a macro to check this.
relax pose was crashing - missing a check.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f2c8b57571b..1080388bfab 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -313,7 +313,16 @@ extern Object workob; #define OB_TEXTURE 5 /* this condition has been made more complex since editmode can draw textures */ -#define CHECK_OB_DRAWTEXTURE(vd, dt) ((vd->drawtype==OB_TEXTURE && dt>OB_SOLID) || (vd->drawtype==OB_SOLID && vd->flag2 & V3D_SOLID_TEX)) +#define CHECK_OB_DRAWTEXTURE(vd, dt) \ + ((vd->drawtype==OB_TEXTURE && dt>OB_SOLID) || \ + (vd->drawtype==OB_SOLID && vd->flag2 & V3D_SOLID_TEX)) + +#define CHECK_OB_DRAWFACEDOT(sce, vd, dt) \ + ( (sce->selectmode & SCE_SELECT_FACE) && \ + (vd->drawtype<=OB_SOLID) && \ + (((vd->drawtype==OB_SOLID) && (dt>=OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX) && (vd->flag & V3D_ZBUF_SELECT)) == 0) \ + ) + /* dtx: flags, char! */ #define OB_AXIS 2 |