Merge branch 'master' into blender2.8

4 files changed, 61 insertions, 11 deletions

diff --git a/build_files/build_environment/cmake/embree.cmake b/build_files/build_environment/cmake/embree.cmake
index 34e5904db5e..8c523e25f0c 100644
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -44,3 +44,26 @@ ExternalProject_Add(external_embree
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/embree
 )
+if(WIN32)
+
+	if(BUILD_MODE STREQUAL Release)
+		ExternalProject_Add_Step(external_embree after_install
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
+			DEPENDEES install
+		)
+	else()
+	ExternalProject_Add_Step(external_embree after_install
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
+			DEPENDEES install
+		)
+	endif()
+
+endif()
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index d0d8b4cefb9..f2e9c2fa8db 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -58,8 +58,6 @@ if(BUILD_MODE STREQUAL Release)
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
 				# webp, straight up copy
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
-				# embree
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
 		DEPENDS
 	)
 endif()
diff --git a/build_files/build_environment/windows/build_deps.cmd b/build_files/build_environment/windows/build_deps.cmd
index 500e689cdc8..bb9dda81435 100644
--- a/build_files/build_environment/windows/build_deps.cmd
+++ b/build_files/build_environment/windows/build_deps.cmd
@@ -68,6 +68,8 @@ goto usage
 setlocal ENABLEEXTENSIONS
 set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=On
 if "%3" == "debug" set CMAKE_DEBUG_OPTIONS=-DWITH_OPTIMIZED_DEBUG=Off
+set dobuild=1
+if "%4" == "nobuild" set dobuild=0
 
 set SOURCE_DIR=%~dp0\..
 set BUILD_DIR=%cd%\build
@@ -117,20 +119,24 @@ cd %Staging%\%BuildDir%%ARCH%R
 echo %DATE% %TIME% : Start > %StatusFile%
 cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
-msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
-msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
-echo %DATE% %TIME% : Release Build done >> %StatusFile%
-cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
+if "%dobuild%" == "1" (
+	msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
+	msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal  /verbosity:minimal
+	echo %DATE% %TIME% : Release Build done >> %StatusFile%
+	cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
+)
 echo %DATE% %TIME% : Release Harvest done >> %StatusFile%
 cd %BUILD_DIR%
 mkdir %STAGING%\%BuildDir%%ARCH%D
 cd %Staging%\%BuildDir%%ARCH%D
 cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
-msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
-msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
-echo %DATE% %TIME% : Debug Build done >> %StatusFile%
-cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
+if "%dobuild%" == "1" (
+	msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 
+	msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
+	echo %DATE% %TIME% : Debug Build done >> %StatusFile%
+	cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
+)
 echo %DATE% %TIME% : Debug Harvest done >> %StatusFile%
 cd %BUILD_DIR%
 
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 51cc4b2fd34..8c3ddefa68e 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -608,7 +608,30 @@ if(WITH_CYCLES_OSL)
 endif()
 
 if(WITH_CYCLES_EMBREE)
-	find_package(Embree 3.2.4 REQUIRED)
+	windows_find_package(Embree)
+	if(NOT EMBREE_FOUND)
+		set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
+		set(EMBREE_LIBRARIES
+			optimized ${LIBDIR}/embree/lib/embree3.lib
+			optimized ${LIBDIR}/embree/lib/embree_avx2.lib
+			optimized ${LIBDIR}/embree/lib/embree_avx.lib
+			optimized ${LIBDIR}/embree/lib/embree_sse42.lib
+			optimized ${LIBDIR}/embree/lib/lexers.lib
+			optimized ${LIBDIR}/embree/lib/math.lib
+			optimized ${LIBDIR}/embree/lib/simd.lib
+			optimized ${LIBDIR}/embree/lib/sys.lib
+			optimized ${LIBDIR}/embree/lib/tasking.lib
+
+			debug ${LIBDIR}/embree/lib/embree3_d.lib
+			debug ${LIBDIR}/embree/lib/embree_avx2_d.lib
+			debug ${LIBDIR}/embree/lib/embree_avx_d.lib
+			debug ${LIBDIR}/embree/lib/embree_sse42_d.lib
+			debug ${LIBDIR}/embree/lib/lexers_d.lib
+			debug ${LIBDIR}/embree/lib/math_d.lib
+			debug ${LIBDIR}/embree/lib/simd_d.lib
+			debug ${LIBDIR}/embree/lib/sys_d.lib
+			debug ${LIBDIR}/embree/lib/tasking_d.lib)
+	endif()
 endif()
 
 if (WINDOWS_PYTHON_DEBUG)