blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

WIP: Test Embree alternative to Blender BVH trees #108148

Draft
Lukas Tönne wants to merge 12 commits from LukasTonne/blender:bvh-embree into main
pull from: LukasTonne/blender:bvh-embree
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 12 Files Changed 16 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90781d29cb - Show all commits

4
source/blender/blenkernel/CMakeLists.txt
View File

@ -791,7 +791,9 @@ endif()
if(WITH_BVH_EMBREE)
add_definitions(-DWITH_BVH_EMBREE)
list(APPEND INC_SYS
${EMBREE_INCLUDE_DIRS}
)
list(APPEND LIB
${EMBREE_LIBRARIES}
)

8
source/blender/blenkernel/intern/bvh.cc
View File

@ -12,10 +12,10 @@
#ifdef WITH_BVH_EMBREE
# include <embree/include/embree3/rtcore.h>
# include <embree/include/embree3/rtcore_geometry.h>
# include <embree/include/embree3/rtcore_ray.h>
# include <embree/include/embree3/rtcore_scene.h>
# include <embree3/rtcore.h>
# include <embree3/rtcore_geometry.h>
# include <embree3/rtcore_ray.h>
# include <embree3/rtcore_scene.h>
namespace blender {