[Bf-blender-cvs] [b0f5545ec7b] cycles-x: Merge branch 'master' into cycles-x

[Brecht Van Lommel]

Commit: b0f5545ec7b533357cb33191666266f431e22844
Author: Brecht Van Lommel
Date:   Mon Aug 23 15:51:54 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBb0f5545ec7b533357cb33191666266f431e22844

Merge branch 'master' into cycles-x

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



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

diff --cc build_files/config/pipeline_config.yaml
index 7ff99659bc9,5d1a24a30f1..8222f2ff0b9
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@@ -51,11 -51,11 +51,11 @@@ buildbot
      gcc:
          version: '9.0.0'
      cuda10:
-         version: '10.1.0'
+         version: '10.1.243'
      cuda11:
-         version: '11.4.0'
+         version: '11.4.1'
      optix:
 -        version: '7.1.0'
 +        version: '7.3.0'
      cmake:
          default:
              version: any