Commit: 60befc8f0284e70fda2ef1d704cb3f81ec406170 Author: Ray Molenkamp Date: Tue Nov 23 10:51:09 2021 -0700 Branches: master https://developer.blender.org/rB60befc8f0284e70fda2ef1d704cb3f81ec406170
Clean-up: Fix BLI_rect.h collision with windows.h windows.h `#defines rct1` as a number which is problematic if we include `BLI_rect.h` after `windows.h` . by renaming `rct1/2` to `rct_a/b` we side step the collision and straighten up the naming with the functions directly above it. =================================================================== M source/blender/blenlib/BLI_rect.h =================================================================== diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index fb52436587f..ca06a3e3545 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -110,8 +110,8 @@ bool BLI_rcti_isect_circle(const struct rcti *rect, const float xy[2], const flo bool BLI_rctf_isect_circle(const struct rctf *rect, const float xy[2], const float radius); bool BLI_rcti_inside_rcti(const rcti *rct_a, const rcti *rct_b); bool BLI_rctf_inside_rctf(const rctf *rct_a, const rctf *rct_b); -void BLI_rcti_union(struct rcti *rct1, const struct rcti *rct2); -void BLI_rctf_union(struct rctf *rct1, const struct rctf *rct2); +void BLI_rcti_union(struct rcti *rct_a, const struct rcti *rct_b); +void BLI_rctf_union(struct rctf *rct_a, const struct rctf *rct_b); void BLI_rcti_rctf_copy(struct rcti *dst, const struct rctf *src); void BLI_rctf_rcti_copy(struct rctf *dst, const struct rcti *src); void BLI_rcti_rctf_copy_floor(struct rcti *dst, const struct rctf *src); _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
