blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: clang tidy 

The parameter name was inconsistent with the declaration.
This commit is contained in:
Jacques Lucke 2021-11-23 19:38:22 +01:00
parent 38a3819171
commit 62a04f7aa6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,35 +401,35 @@ bool BLI_rctf_isect_circle(const rctf *rect, const float xy[2], const float radi
return dx * dx + dy * dy <= radius * radius;
}
void BLI_rctf_union(rctf *rct1, const rctf *rct2)
void BLI_rctf_union(rctf *rct_a, const rctf *rct_b)
{
if (rct1->xmin > rct2->xmin) {
rct1->xmin = rct2->xmin;
if (rct_a->xmin > rct_b->xmin) {
rct_a->xmin = rct_b->xmin;
}
if (rct1->xmax < rct2->xmax) {
rct1->xmax = rct2->xmax;
if (rct_a->xmax < rct_b->xmax) {
rct_a->xmax = rct_b->xmax;
}
if (rct1->ymin > rct2->ymin) {
rct1->ymin = rct2->ymin;
if (rct_a->ymin > rct_b->ymin) {
rct_a->ymin = rct_b->ymin;
}
if (rct1->ymax < rct2->ymax) {
rct1->ymax = rct2->ymax;
if (rct_a->ymax < rct_b->ymax) {
rct_a->ymax = rct_b->ymax;
}
}
void BLI_rcti_union(rcti *rct1, const rcti *rct2)
void BLI_rcti_union(rcti *rct_a, const rcti *rct_b)
{
if (rct1->xmin > rct2->xmin) {
rct1->xmin = rct2->xmin;
if (rct_a->xmin > rct_b->xmin) {
rct_a->xmin = rct_b->xmin;
}
if (rct1->xmax < rct2->xmax) {
rct1->xmax = rct2->xmax;
if (rct_a->xmax < rct_b->xmax) {
rct_a->xmax = rct_b->xmax;
}
if (rct1->ymin > rct2->ymin) {
rct1->ymin = rct2->ymin;
if (rct_a->ymin > rct_b->ymin) {
rct_a->ymin = rct_b->ymin;
}
if (rct1->ymax < rct2->ymax) {
rct1->ymax = rct2->ymax;
if (rct_a->ymax < rct_b->ymax) {
rct_a->ymax = rct_b->ymax;
}
}