From 25607258073d3574a13f2fd5544a5e3cd90eb767 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 12 Jul 2012 08:34:59 +0000 Subject: - add a temp var for edge scanfill (fits in 4 bytes alignment - won't increase mem usage) - make keyindex an unsigned int, since its used to store vertex indices - use BLI_in_rcti_v for IN_2D_VERT_SCROLL and IN_2D_HORIZ_SCROLL --- source/blender/blenlib/BLI_scanfill.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/blenlib/BLI_scanfill.h') diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index cb996119fff..a6b1943cb4d 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -70,7 +70,7 @@ typedef struct ScanFillVert { } tmp; float co[3]; /* vertex location */ float xy[2]; /* 2D copy of vertex location (using dominant axis) */ - int keyindex; /* original index #, for restoring key information */ + unsigned int keyindex; /* original index #, for restoring key information */ short poly_nr; unsigned char f, h; } ScanFillVert; @@ -80,6 +80,9 @@ typedef struct ScanFillEdge { struct ScanFillVert *v1, *v2; short poly_nr; unsigned char f; + union { + unsigned char c; + } tmp; } ScanFillEdge; typedef struct ScanFillFace { -- cgit v1.2.3