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

[Brecht Van Lommel]

Commit: 3f2090f401f2e0c63fc25a4be72d342a564cff2e
Author: Brecht Van Lommel
Date:   Fri Aug 31 13:00:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3f2090f401f2e0c63fc25a4be72d342a564cff2e

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/buildbot/slave_compile.py
index ce4d0c8de66,d5ec5630e39..61ce11bbe0c
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@@ -59,7 -59,8 +59,7 @@@ if 'cmake' in builder
      bits = 64
  
      # Config file to be used (relative to blender's sources root)
-     cmake_config_file = "build_files/cmake/config/blender_full.cmake"
+     cmake_config_file = "build_files/cmake/config/blender_release.cmake"
 -    cmake_player_config_file = None
      cmake_cuda_config_file = None
  
      # Set build options.