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_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -502,7 +502,7 @@ if(WITH_IMAGE_OPENJPEG)
 	set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
 endif()

-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
 	set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
 	set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
 	set(OPENSUBDIV_LIBRARIES