Merge branch 'blender-v2.92-release'

5 files changed, 15 insertions, 2 deletions

diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index cf8ebc2a1d9..51cc47fa704 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -55,11 +55,15 @@ set(SRC
 )
 
 if(CXX_HAS_AVX)
-  list(APPEND SRC util_avxf_avx_test.cpp)
+  list(APPEND SRC
+    util_avxf_avx_test.cpp
+  )
   set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
 endif()
 if(CXX_HAS_AVX2)
-  list(APPEND SRC util_avxf_avx2_test.cpp)
+  list(APPEND SRC
+    util_avxf_avx2_test.cpp
+  )
   set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
 endif()
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 82f985a3227..20c57f4e15a 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -300,6 +300,8 @@ set(SRC
   BKE_constraint.h
   BKE_context.h
   BKE_crazyspace.h
+  BKE_cryptomatte.h
+  BKE_cryptomatte.hh
   BKE_curve.h
   BKE_curveprofile.h
   BKE_customdata.h
@@ -363,6 +365,7 @@ set(SRC
   BKE_mesh_remesh_voxel.h
   BKE_mesh_runtime.h
   BKE_mesh_tangent.h
+  BKE_mesh_types.h
   BKE_mesh_wrapper.h
   BKE_modifier.h
   BKE_movieclip.h
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index b7a13596dd0..363d3003b3c 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -278,6 +278,7 @@ set(SRC
   BLI_sys_types.h
   BLI_system.h
   BLI_task.h
+  BLI_task.hh
   BLI_threads.h
   BLI_timecode.h
   BLI_timeit.hh
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 5d1ed7b44a1..db34cf83fa9 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -132,10 +132,12 @@ set(SRC
   ../../blenlib/intern/hash_mm2a.c
   ../../blenlib/intern/listbase.c
 
+  ../DNA_armature_defaults.h
   ../DNA_asset_defaults.h
   ../DNA_brush_defaults.h
   ../DNA_cachefile_defaults.h
   ../DNA_camera_defaults.h
+  ../DNA_collection_defaults.h
   ../DNA_curve_defaults.h
   ../DNA_defaults.h
   ../DNA_fluid_defaults.h
@@ -151,7 +153,9 @@ set(SRC
   ../DNA_meta_defaults.h
   ../DNA_modifier_defaults.h
   ../DNA_modifier_types.h
+  ../DNA_movieclip_defaults.h
   ../DNA_object_defaults.h
+  ../DNA_particle_defaults.h
   ../DNA_pointcloud_defaults.h
   ../DNA_scene_defaults.h
   ../DNA_simulation_defaults.h
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index e9985cb0e13..ed4d658eb4f 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -308,6 +308,7 @@ set(SRC
   NOD_derived_node_tree.hh
   NOD_function.h
   NOD_geometry.h
+  NOD_geometry_exec.hh
   NOD_math_functions.hh
   NOD_node_tree_dependencies.hh
   NOD_node_tree_multi_function.hh