Merge remote-tracking branch 'origin/master' into blender2.8

build_files/build_environment/cmake/ffmpeg.cmake

@@ -112,6 +112,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-indev=alsa
 		--disable-outdev=alsa
 		--disable-crystalhd
+		--disable-sndio
 	BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}

build_files/build_environment/cmake/sdl.cmake

@@ -25,6 +25,7 @@ else()
 		-DSDL_STATIC=ON
 		-DSDL_SHARED=OFF
 		-DSDL_VIDEO=OFF
+		-DSNDIO=OFF
 	)
 endif()
 

intern/cycles/CMakeLists.txt

@@ -283,6 +283,8 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
 			set(MAX_MSVC 1910)
 		elseif(${CUDA_VERSION} EQUAL "9.1")
 			set(MAX_MSVC 1911)
+		elseif(${CUDA_VERSION} EQUAL "10.0")
+			set(MAX_MSVC 1999)
 		endif()
 		if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 			message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")