Merge branch 'master' into blender2.8

2018-11-26 12:00:36 +01:00
parent 3a038db576 acd1d1a31d
commit 0970ed0550
11 changed files with 7 additions and 14 deletions
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -390,7 +390,7 @@ if(WITH_LLVM OR WITH_SDL_DYNLOAD)
 	)
 endif()

-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
 	find_package_wrapper(OpenSubdiv)

 	set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
@@ -398,7 +398,6 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)

 	if(NOT OPENSUBDIV_FOUND)
 		set(WITH_OPENSUBDIV OFF)
-		set(WITH_CYCLES_OPENSUBDIV OFF)
 		message(STATUS "OpenSubdiv not found")
 	endif()
 endif()