Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9273d8578 - Show all commits

12
intern/cycles/util/boundbox.h
View File

@ -56,8 +56,8 @@ class BoundBox {
__forceinline void grow(const BoundBox &bbox) __forceinline void grow(const BoundBox &bbox)
{ {
grow(bbox.min); min = ccl::min(bbox.min, min);
grow(bbox.max); max = ccl::max(bbox.max, max);
} }
__forceinline void grow_safe(const float3 &pt) __forceinline void grow_safe(const float3 &pt)
@ -81,8 +81,12 @@ class BoundBox {
__forceinline void grow_safe(const BoundBox &bbox) __forceinline void grow_safe(const BoundBox &bbox)
{ {
grow_safe(bbox.min); if (isfinite_safe(bbox.min)) {
grow_safe(bbox.max); min = ccl::min(bbox.min, min);
}
if (isfinite_safe(bbox.max)) {
max = ccl::max(bbox.max, max);
}
} }
__forceinline void intersect(const BoundBox &bbox) __forceinline void intersect(const BoundBox &bbox)