From 62a04f7aa6982d8f8143c8c71e5402a46cbc8b48 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 23 Nov 2021 19:38:22 +0100 Subject: Cleanup: clang tidy The parameter name was inconsistent with the declaration. --- source/blender/blenlib/intern/rct.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 35e24ecc785..b73c5865e1a 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -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; } } -- cgit v1.2.3