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

[Campbell Barton]

Commit: a52152c59fa28993dd9e82866cf69a76cc63d9d9
Author: Campbell Barton
Date:   Sun Jun 10 08:21:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa52152c59fa28993dd9e82866cf69a76cc63d9d9

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/cmake/Modules/FindGLEW.cmake
index 3057237f3c6,0504e75787b..b36a3272e3d
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@@ -49,7 -50,17 +49,7 @@@ FIND_LIBRARY(GLEW_LIBRAR
      lib64 lib
    )
  
- # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
 -
 -FIND_LIBRARY(GLEW_MX_LIBRARY
 -  NAMES
 -    GLEWmx
 -  HINTS
 -    ${_glew_SEARCH_DIRS}
 -  PATH_SUFFIXES
 -    lib64 lib
 -  )
 -
+ # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
  # all listed variables are TRUE
  INCLUDE(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
diff --cc build_files/cmake/Modules/FindSndFile.cmake
index c210c523c58,3b4ab38e842..ef6fb73598f
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@@ -50,7 -50,7 +50,7 @@@ FIND_LIBRARY(LIBSNDFILE_LIBRAR
      lib64 lib
    )
  
- # handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if 
 -# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if
++# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if
  # all listed variables are TRUE
  INCLUDE(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
diff --cc build_files/cmake/config/blender_headless.cmake
index 8f2ad03279c,4399eb9e5c4..73b43272643
--- a/build_files/cmake/config/blender_headless.cmake
+++ b/build_files/cmake/config/blender_headless.cmake
@@@ -5,7 -5,8 +5,7 @@@
  #   cmake -C../blender/build_files/cmake/config/blender_headless.cmake  ../blender
  #
  
- set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE) 
+ set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE)
 -set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
  
  # disable audio, its possible some devs may want this but for now disable
  # so the python module doesnt hold the audio device and loads quickly.