[Bf-blender-cvs] [c73894ea5b9] tmp-vulkan: Merge commit 'master@{12-weeks-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: c73894ea5b9bda03f538dedf878b7b2942790446
Author: Jeroen Bakker
Date:   Mon Jun 28 13:05:21 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rBc73894ea5b9bda03f538dedf878b7b2942790446

Merge commit 'master@{12-weeks-ago}' into tmp-vulkan

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



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

diff --cc extern/CMakeLists.txt
index 2a065582750,824b2fb0e9c..07084789bda
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@@ -110,6 -110,6 +110,10 @@@ if(WITH_MOD_FLUID
    add_subdirectory(mantaflow)
  endif()
  
+ if (WITH_COMPOSITOR)
+ 	add_subdirectory(smaa_areatex)
+ endif()
++
 +if(WITH_VULKAN)
 +  add_subdirectory(vulkan_memory_allocator)
 +endif()