[Bf-blender-cvs] [2597cd39982] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 2597cd39982100efeeb13b597f3e432ef9346d85
Author: Campbell Barton
Date:   Wed Sep 12 15:54:07 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB2597cd39982100efeeb13b597f3e432ef9346d85

Merge branch 'master' into blender2.8

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



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

diff --cc CMakeLists.txt
index f86a696d419,91a79af8141..fa1405994c3
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -165,8 -165,8 +165,7 @@@ option_defaults_init
  	_init_OPENCOLORIO
  	_init_SDL
  	_init_FFTW3
 -	_init_GAMEENGINE
  	_init_OPENSUBDIV
- 	_init_SYSTEM_OPENJPG
  )
  
  # customize...
diff --cc extern/CMakeLists.txt
index 4f8f2ff2b54,5e89ecc1d92..3abf88fd259
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@@ -63,10 -63,10 +63,6 @@@ if(NOT WITH_SYSTEM_GLEW
  	endif()
  endif()
  
- if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG))
- 	add_subdirectory(libopenjpeg)
 -if(WITH_GAMEENGINE)
 -	add_subdirectory(recastnavigation)
--endif()
--
  if(WITH_LZO AND NOT WITH_SYSTEM_LZO)
  	add_subdirectory(lzo)
  endif()