diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-08 09:54:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-08 09:54:24 +0200 |
| commit | 17a81260cb92a321a0d752e369ef911055178c7b (patch) | |
| tree | 560fecf8101295846847ad31799345c20f0226c2 | |
| parent | 4c30718102f2487b31a6202e18cec08efc44f117 (diff) | |
| parent | 7699d678c417945dda228c468731a1e3369dd88a (diff) | |
| download | redot-engine-17a81260cb92a321a0d752e369ef911055178c7b.tar.gz | |
Merge pull request #91684 from Chubercik/embree4_aftermath
Fix `builtin_embree=no` build linking the wrong version of Embree
| -rw-r--r-- | core/math/static_raycaster.h | 2 | ||||
| -rw-r--r-- | platform/linuxbsd/detect.py | 2 | ||||
| -rw-r--r-- | scene/3d/lightmapper.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/math/static_raycaster.h b/core/math/static_raycaster.h index c53868e12d..74e4b75163 100644 --- a/core/math/static_raycaster.h +++ b/core/math/static_raycaster.h @@ -49,7 +49,7 @@ protected: static StaticRaycaster *(*create_function)(); public: - // compatible with embree3 rays + // Compatible with embree4 rays. struct __aligned(16) Ray { const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index afc9d25a80..a8b8d2934a 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -309,7 +309,7 @@ def configure(env: "SConsEnvironment"): if not env["builtin_embree"] and env["arch"] in ["x86_64", "arm64"]: # No pkgconfig file so far, hardcode expected lib name. - env.Append(LIBS=["embree3"]) + env.Append(LIBS=["embree4"]) if not env["builtin_openxr"]: env.ParseConfig("pkg-config openxr --cflags --libs") diff --git a/scene/3d/lightmapper.h b/scene/3d/lightmapper.h index 446ed794ed..521013d600 100644 --- a/scene/3d/lightmapper.h +++ b/scene/3d/lightmapper.h @@ -61,7 +61,7 @@ protected: static LightmapRaycaster *(*create_function)(); public: - // compatible with embree3 rays + // Compatible with embree4 rays. struct __aligned(16) Ray { const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h |