[Bf-blender-cvs] [e748d6d57c9] tmp-gpu-shader-descriptor-2: Merge branch 'master' into tmp-gpu-shader-descriptor-2

[Jeroen Bakker]

Commit: e748d6d57c94f2660eb752995a685e3837206d3d
Author: Jeroen Bakker
Date:   Wed Jan 12 07:59:52 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rBe748d6d57c94f2660eb752995a685e3837206d3d

Merge branch 'master' into tmp-gpu-shader-descriptor-2

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



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