[Bf-blender-cvs] [548346fa688] tmp_lib_update_32: Merge remote-tracking branch 'origin/master' into tmp_oiio_23

[Ray Molenkamp]

Commit: 548346fa6884de88fff643ac3f1acfd1143c8885
Author: Ray Molenkamp
Date:   Thu Feb 10 09:09:24 2022 -0700
Branches: tmp_lib_update_32
https://developer.blender.org/rB548346fa6884de88fff643ac3f1acfd1143c8885

Merge remote-tracking branch 'origin/master' into tmp_oiio_23

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



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

diff --cc build_files/build_environment/cmake/download.cmake
index 5c59264a282,d3a4d767c08..9b58d4483c3
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@@ -94,5 -94,4 +94,6 @@@ download_source(POTRACE
  download_source(HARU)
  download_source(ZSTD)
  download_source(FLEX)
+ download_source(BROTLI)
 +download_source(FMT)
 +download_source(ROBINMAP)