diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-19 00:54:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-19 00:54:43 +0400 |
| commit | ab662a1e02299691867c3c4480000d630377ea37 (patch) | |
| tree | 4903de1b0d3364293346d0c11f86f3724995a3bf /source/blender/blenlib/intern/rct.c | |
| parent | 12425588f2d33174e4a78873075b185ea51ebc3d (diff) | |
fix for own commit r49991, this exposed bad logic in rect copy function.
Diffstat (limited to 'source/blender/blenlib/intern/rct.c')
| -rw-r--r-- | source/blender/blenlib/intern/rct.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index e22becddfd6..9c65c26c72b 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -363,12 +363,20 @@ int BLI_rcti_isect(const rcti *src1, const rcti *src2, rcti *dest) } } -void BLI_rcti_rctf_copy(rcti *tar, const rctf *src) +void BLI_rcti_rctf_copy(rcti *dst, const rctf *src) { - tar->xmin = floorf(src->xmin + 0.5f); - tar->xmax = floorf((src->xmax - src->xmin) + 0.5f); - tar->ymin = floorf(src->ymin + 0.5f); - tar->ymax = floorf((src->ymax - src->ymin) + 0.5f); + dst->xmin = floorf(src->xmin + 0.5f); + dst->xmax = dst->xmin + floorf((src->xmax - src->xmin) + 0.5f); + dst->ymin = floorf(src->ymin + 0.5f); + dst->ymax = dst->ymin + floorf((src->ymax - src->ymin) + 0.5f); +} + +void BLI_rctf_rcti_copy(rctf *dst, const rcti *src) +{ + dst->xmin = src->xmin; + dst->xmax = src->xmax; + dst->ymin = src->ymin; + dst->ymax = src->ymax; } void print_rctf(const char *str, const rctf *rect) |