blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

correct own error in rectangle clamping

This commit is contained in:
Campbell Barton 2015-10-17 18:52:05 +11:00
parent 88767a1939
commit 2927fa4450
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenlib/intern/rct.c
View File

@ -508,8 +508,8 @@ bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
if (rect->xmin < rect_bounds->xmin) {
float ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += r_xy[0];
rect->xmax += r_xy[0];
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
@ -524,8 +524,8 @@ bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
if (rect->ymin < rect_bounds->ymin) {
float ofs = rect_bounds->ymin - rect->ymin;
rect->ymin += r_xy[1];
rect->ymax += r_xy[1];
rect->ymin += ofs;
rect->ymax += ofs;
r_xy[1] += ofs;
changed = true;
}
@ -550,8 +550,8 @@ bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
if (rect->xmin < rect_bounds->xmin) {
int ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += r_xy[0];
rect->xmax += r_xy[0];
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
@ -566,8 +566,8 @@ bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
if (rect->ymin < rect_bounds->ymin) {
int ofs = rect_bounds->ymin - rect->ymin;
rect->ymin += r_xy[1];
rect->ymax += r_xy[1];
rect->ymin += ofs;
rect->ymax += ofs;
r_xy[1] += ofs;
changed = true;
}