Skip to content

Commit 26b3896

Browse files
committed
Embree updated
1 parent ba95674 commit 26b3896

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if( WITH_CYCLES_OPENSUBDIV )
119119
endif()
120120

121121
if( WITH_CYCLES_EMBREE )
122-
find_package(Embree "3.5.0" REQUIRED)
122+
find_package(Embree REQUIRED)
123123
add_definitions( -DWITH_EMBREE=1 )
124124
endif()
125125

build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ def releaseId() :
334334
"include/*",
335335
"lib/*.cubin",
336336
"lib/*.ptx",
337-
"lib/libembree3*",
338337
"lib/libosdCPU*",
339338
"lib/libGafferCycles*",
340339
"license/*",

dependencies/Embree/config.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"downloads" : [
44

5-
"https://github.com/embree/embree/archive/v3.5.0.tar.gz"
5+
"https://github.com/embree/embree/archive/v3.7.0.tar.gz"
66

77
],
88

@@ -19,12 +19,12 @@
1919
" -D CMAKE_PREFIX_PATH={gafferRoot}"
2020
" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
2121
" -D {libLinkType}"
22-
" -DEMBREE_ISPC_SUPPORT=OFF"
23-
" -DEMBREE_TUTORIALS=OFF"
24-
" -DEMBREE_RAY_MASK=ON"
25-
" -DEMBREE_FILTER_FUNCTION=ON"
26-
" -DEMBREE_BACKFACE_CULLING=OFF"
27-
" -DEMBREE_TASKING_SYSTEM=INTERNAL"
22+
" -D EMBREE_ISPC_SUPPORT=OFF"
23+
" -D EMBREE_TUTORIALS=OFF"
24+
" -D EMBREE_RAY_MASK=ON"
25+
" -D EMBREE_FILTER_FUNCTION=ON"
26+
" -D EMBREE_BACKFACE_CULLING=OFF"
27+
" -D EMBREE_TASKING_SYSTEM=INTERNAL"
2828
" ..",
2929
"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
3030

@@ -34,7 +34,7 @@
3434

3535
"static" : "EMBREE_STATIC_LIB=ON",
3636
"shared" : "EMBREE_STATIC_LIB=OFF",
37-
"default" : "EMBREE_STATIC_LIB=OFF",
37+
"default" : "EMBREE_STATIC_LIB=ON",
3838

3939
},
4040

0 commit comments

Comments
 (0)