diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-11 10:49:07 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-11 10:49:07 +0200 |
commit | 4223444d87e125534c72d09c4f45ed490b0c5e5e (patch) | |
tree | 0d01aa1b5ff30255369e3e75f40b6fe1df905433 /thirdparty | |
parent | 7359423b16bb3adfa6335d19816169aa27196307 (diff) | |
parent | c24ea0ecca315676ba31387bf3a277de39ba339a (diff) | |
download | redot-engine-4223444d87e125534c72d09c4f45ed490b0c5e5e.tar.gz |
Merge pull request #92993 from capnm/240610-embree-error-hotfix
CI: Hotfix for build error with newer clang++
Diffstat (limited to 'thirdparty')
-rw-r--r-- | thirdparty/embree/kernels/geometry/pointi.h | 4 | ||||
-rw-r--r-- | thirdparty/embree/kernels/subdiv/bezier_curve.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/embree/kernels/geometry/pointi.h b/thirdparty/embree/kernels/geometry/pointi.h index f81edb9035..aba8ec4ab3 100644 --- a/thirdparty/embree/kernels/geometry/pointi.h +++ b/thirdparty/embree/kernels/geometry/pointi.h @@ -210,9 +210,9 @@ namespace embree }; /*! output operator */ - friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line) + friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point) { - return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}"; + return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}"; } public: diff --git a/thirdparty/embree/kernels/subdiv/bezier_curve.h b/thirdparty/embree/kernels/subdiv/bezier_curve.h index 257e0afd40..5e3b5c83b3 100644 --- a/thirdparty/embree/kernels/subdiv/bezier_curve.h +++ b/thirdparty/embree/kernels/subdiv/bezier_curve.h @@ -135,7 +135,7 @@ namespace embree } friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) { - return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; + return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; } }; |