diff options
| -rw-r--r-- | source/blender/blenlib/BLI_scanfill.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_view2d.h | 4 |
2 files changed, 6 insertions, 3 deletions
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 { diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index 5039a30b61a..f0bdb2fc2ea 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -120,8 +120,8 @@ enum { /* Macros: */ /* test if mouse in a scrollbar (assume that scroller availability has been tested) */ -#define IN_2D_VERT_SCROLL(v2d, co) (BLI_in_rcti(&v2d->vert, co[0], co[1])) -#define IN_2D_HORIZ_SCROLL(v2d, co) (BLI_in_rcti(&v2d->hor, co[0], co[1])) +#define IN_2D_VERT_SCROLL(v2d, co) (BLI_in_rcti_v(&v2d->vert, co)) +#define IN_2D_HORIZ_SCROLL(v2d, co) (BLI_in_rcti_v(&v2d->hor, co)) /* ------------------------------------------ */ /* Type definitions: */ |