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

[Brecht Van Lommel]

Commit: fd2615fd9b5ac17a006cb3836ebd58e538517507
Author: Brecht Van Lommel
Date:   Wed Aug 29 16:42:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfd2615fd9b5ac17a006cb3836ebd58e538517507

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/buildbot/slave_compile.py
index fc430971c19,6465f2e634d..ce4d0c8de66
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@@ -112,9 -116,10 +114,10 @@@ if 'cmake' in builder
          elif builder.endswith('i686_cmake'):
              bits = 32
              chroot_name = 'buildbot_' + deb_name + '_i686'
 -            targets = ['player', 'blender']
 +            targets = ['blender']
-         cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
-                                     "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
+         if deb_name != "stretch":
+             cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
+                                         "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
  
      cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))