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

Cleanup: Use new BLI_rct utilities to ensure valid rectangles

Browse Source 
Technically this does a slight change to the check in wm_window.c: The
assert now also allows zero width/height rectangles.
This commit is contained in:
Julian Eisel
2020-01-14 19:04:27 +01:00
parent e4bf08a363
commit c167e8ba18
3 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,42 +439,22 @@ void BLI_rcti_union(rcti *rct1, const rcti *rct2)
void BLI_rctf_init(rctf *rect, float xmin, float xmax, float ymin, float ymax)
{
if (xmin <= xmax) {
rect->xmin = xmin;
rect->xmax = xmax;
}
else {
rect->xmax = xmin;
rect->xmin = xmax;
}
if (ymin <= ymax) {
rect->ymin = ymin;
rect->ymax = ymax;
}
else {
rect->ymax = ymin;
rect->ymin = ymax;
}
rect->xmin = xmin;
rect->xmax = xmax;
rect->ymin = ymin;
rect->ymax = ymax;
BLI_rctf_sanitize(rect);
}
void BLI_rcti_init(rcti *rect, int xmin, int xmax, int ymin, int ymax)
{
if (xmin <= xmax) {
rect->xmin = xmin;
rect->xmax = xmax;
}
else {
rect->xmax = xmin;
rect->xmin = xmax;
}
if (ymin <= ymax) {
rect->ymin = ymin;
rect->ymax = ymax;
}
else {
rect->ymax = ymin;
rect->ymin = ymax;
}
rect->xmin = xmin;
rect->xmax = xmax;
rect->ymin = ymin;
rect->ymax = ymax;
BLI_rcti_sanitize(rect);
}
/**