[Bf-blender-cvs] [427e5ef3427] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 427e5ef3427f3a6e026aae5e98deb43cb9d3a96f
Author: Sergey Sharybin
Date:   Tue Jul 10 11:27:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB427e5ef3427f3a6e026aae5e98deb43cb9d3a96f

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc CMakeLists.txt
index 4d2bcc4b0af,da333286478..2961aafe908
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -624,11 -638,16 +624,13 @@@ endif(
  
  if(NOT WITH_AUDASPACE)
  	if(WITH_OPENAL)
- 		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+ 		message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled")
+ 		set(WITH_OPENAL OFF)
  	endif()
  	if(WITH_JACK)
- 		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+ 		message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled")
+ 		set(WITH_JACK OFF)
  	endif()
 -	if(WITH_GAMEENGINE)
 -		message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
 -	endif()
  endif()
  
  if(NOT WITH_SDL AND WITH_GHOST_SDL)