[Bf-blender-cvs] [d5663dfce14] temp-gpu-image-engine: Merge branch 'master' into temp-gpu-image-engine

[Jeroen Bakker]

Commit: d5663dfce146aaf6907b6b48767954a396c98550
Author: Jeroen Bakker
Date:   Mon Nov 29 11:27:30 2021 +0100
Branches: temp-gpu-image-engine
https://developer.blender.org/rBd5663dfce146aaf6907b6b48767954a396c98550

Merge branch 'master' into temp-gpu-image-engine

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index cc107f16942,c7e3a993ace..81bbc2be86d
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -809,9 -808,9 +809,10 @@@ if(WITH_GTESTS
      intern/asset_library_service_test.cc
      intern/asset_library_test.cc
      intern/asset_test.cc
+     intern/bpath_test.cc
      intern/cryptomatte_test.cc
      intern/fcurve_test.cc
 +    intern/image_partial_update_test.cc
      intern/lattice_deform_test.cc
      intern/layer_test.cc
      intern/lib_id_test.cc