Merge remote-tracking branch 'origin/main' into xpetr2
# Conflicts: # com/src/frame.cpp # math/include/math/bounding_volume.hpp # math/include/math/geometry.hpp # math/include/math/geometry/face.hpp # math/include/math/geometry/feature.hpp # math/include/math/geometry/halfedge.hpp # math/include/math/geometry/mesh.hpp # math/include/math/geometry/plane.hpp # math/include/math/geometry/ray.hpp # math/include/math/geometry/shape.hpp # math/include/math/geometry/utils.hpp # math/include/math/geometry/vertex.hpp # math/include/math/math_binding_glm.hpp # math/src/bounding_volume.cpp # math/src/geometry/face.cpp # math/src/geometry/halfedge.cpp # math/src/geometry/mesh.cpp # math/src/geometry/ray.cpp # math/src/geometry/shape.cpp # math/src/geometry/vertex.cpp # utils/include/utils/context_utils.hpp # utils/src/context_utils.cpp
Loading
Please sign in to comment