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

[Jeroen Bakker]

Commit: 33c79e518d6649a5a8c8d14454cd726240b9fd92
Author: Jeroen Bakker
Date:   Wed Jan 12 11:38:23 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB33c79e518d6649a5a8c8d14454cd726240b9fd92

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

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



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