Merge branch 'master' into blender2.8

2017-03-12 03:00:06 +11:00
parent cdb7498f66 bcc8c04db4
commit fbb1b311ea
60 changed files with 873 additions and 336 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -928,7 +928,7 @@ if(WITH_X11)
 	if(WITH_X11_ALPHA)
 		find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
 		mark_as_advanced(X11_Xrender_LIB)
-		if (X11_Xrender_LIB)
+		if(X11_Xrender_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
 		else()
 			set(WITH_X11_ALPHA OFF)