[Bf-blender-cvs] [2e2e7aff7cb] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: 2e2e7aff7cb28337684534d2207816946407788b
Author: Brecht Van Lommel
Date:   Mon Jul 30 18:38:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2e2e7aff7cb28337684534d2207816946407788b

Merge branch 'master' into blender2.8

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



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

diff --cc CMakeLists.txt
index f285b31b9d4,f6435316fec..419da9d94b7
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -738,13 -740,31 +715,10 @@@ if(WITH_BUILDINFO
  	endif()
  endif()
  
- TEST_SHARED_PTR_SUPPORT()
- TEST_UNORDERED_MAP_SUPPORT()
- 
  if(WITH_AUDASPACE)
 -	if(WITH_SYSTEM_AUDASPACE)
 -		set(AUDASPACE_DEFINITIONS
 -			-DWITH_AUDASPACE
 -			-DWITH_SYSTEM_AUDASPACE
 -			"-DAUD_DEVICE_H=<AUD_Device.h>"
 -			"-DAUD_SPECIAL_H=<AUD_Special.h>"
 -			"-DAUD_SOUND_H=<AUD_Sound.h>"
 -			"-DAUD_HANDLE_H=<AUD_Handle.h>"
 -			"-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
 -			"-DAUD_TYPES_H=<AUD_Types.h>"
 -			"-DAUD_PYTHON_H=<python/PyAPI.h>"
 -		)
 -	else()
 -		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
 -		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
 -		set(AUDASPACE_DEFINITIONS
 -			-DWITH_AUDASPACE
 -			"-DAUD_DEVICE_H=<AUD_C-API.h>"
 -			"-DAUD_SPECIAL_H=<AUD_C-API.h>"
 -			"-DAUD_SOUND_H=<AUD_C-API.h>"
 -			"-DAUD_HANDLE_H=<AUD_C-API.h>"
 -			"-DAUD_SEQUENCE_H=<AUD_C-API.h>"
 -			"-DAUD_TYPES_H=<AUD_Space.h>"
 -		)
 +	if(NOT WITH_SYSTEM_AUDASPACE)
 +		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
 +		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings")
  	endif()
  endif()
  
diff --cc source/blender/depsgraph/CMakeLists.txt
index 185a98f2a2b,ced045e9e2f..c9cdea34401
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@@ -106,28 -100,10 +106,6 @@@ set(SR
  	util/deg_util_function.h
  )
  
- if(WITH_CXX11)
- 	add_definitions(-DDEG_STD_UNORDERED_MAP)
- elseif(HAVE_STD_UNORDERED_MAP_HEADER)
- 	if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
- 		add_definitions(-DDEG_STD_UNORDERED_MAP)
- 	else()
- 		if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
- 			add_definitions(-DDEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
- 		else()
- 			add_definitions(-DDEG_NO_UNORDERED_MAP)
- 			message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
- 		endif()
- 	endif()
- else()
- 	if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
- 		add_definitions(-DDEG_TR1_UNORDERED_MAP)
- 	else()
- 		add_definitions(-DDEG_NO_UNORDERED_MAP)
- 		message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
- 	endif()
 -if(WITH_LEGACY_DEPSGRAPH)
 -	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
--endif()
--
  if(WITH_BOOST)
  	list(APPEND INC_SYS
  		${BOOST_INCLUDE_DIR}