archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- add a temp var for edge scanfill (fits in 4 bytes alignment - won't increase mem usage)

Browse Source 
- 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
This commit is contained in:
Campbell Barton
2012-07-12 08:34:59 +00:00
parent 993dfd7d2a
commit 2560725807
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenlib/BLI_scanfill.h
View File

@@ -70,7 +70,7 @@ typedef struct ScanFillVert {
} tmp; } tmp;
float co[3]; /* vertex location */ float co[3]; /* vertex location */
float xy[2]; /* 2D copy of vertex location (using dominant axis) */ 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; short poly_nr;
unsigned char f, h; unsigned char f, h;
} ScanFillVert; } ScanFillVert;
@@ -80,6 +80,9 @@ typedef struct ScanFillEdge {
struct ScanFillVert *v1, *v2; struct ScanFillVert *v1, *v2;
short poly_nr; short poly_nr;
unsigned char f; unsigned char f;
union {
unsigned char c;
} tmp;
} ScanFillEdge; } ScanFillEdge;
typedef struct ScanFillFace { typedef struct ScanFillFace {

4
source/blender/editors/include/UI_view2d.h
View File

@@ -120,8 +120,8 @@ enum {
/* Macros: */ /* Macros: */
/* test if mouse in a scrollbar (assume that scroller availability has been tested) */ /* 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_VERT_SCROLL(v2d, co) (BLI_in_rcti_v(&v2d->vert, co))
#define IN_2D_HORIZ_SCROLL(v2d, co) (BLI_in_rcti(&v2d->hor, co[0], co[1])) #define IN_2D_HORIZ_SCROLL(v2d, co) (BLI_in_rcti_v(&v2d->hor, co))
/* ------------------------------------------ */ /* ------------------------------------------ */
/* Type definitions: */ /* Type definitions: */