Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 11:00:19 +0000 (13:00 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 11:00:19 +0000 (13:00 +0200)
1  2 
build_files/buildbot/config/blender_linux.cmake
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake
intern/ghost/intern/GHOST_SystemX11.cpp

index ce4d0c8de669e22c1385a70aeb819fe7d6666a5b,d5ec5630e39ec4aa5c4759f2341e3b7a7e0a16c4..61ce11bbe0c003c4ba19a0fae0e7eafb493dc878
@@@ -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.