Merge branch 'blender-v2.92-release'

build_files/cmake/cmake_consistency_check.py

@@ -43,6 +43,12 @@ global_h = set()
 global_c = set()
 global_refs = {}
 
+# Flatten `IGNORE_SOURCE_MISSING` to avoid nested looping.
+IGNORE_SOURCE_MISSING = [
+    (k, ig) for k, ig_list in IGNORE_SOURCE_MISSING
+    for ig in ig_list
+]
+
 # Ignore cmake file, path pairs.
 global_ignore_source_missing = {}
 for k, v in IGNORE_SOURCE_MISSING:
@@ -178,6 +184,8 @@ def cmake_get_src(f):
 
                     if not l:
                         pass
+                    elif l in local_ignore_source_missing:
+                        local_ignore_source_missing.remove(l)
                     elif l.startswith("$"):
                         if context_name == "SRC":
                             # assume if it ends with context_name we know about it
@@ -226,9 +234,6 @@ def cmake_get_src(f):
                                     # # Save time. just replace the line
                                     # replace_line(f, i - 1, new_path_rel)
 
-                            else:
-                                if l in local_ignore_source_missing:
-                                    local_ignore_source_missing.remove(l)
                             else:
                                 raise Exception("non existent include %s:%d -> %s" % (f, i, new_file))
 

build_files/cmake/cmake_consistency_check_config.py

@@ -34,8 +34,18 @@ IGNORE_SOURCE = (
 
 # Ignore cmake file, path pairs.
 IGNORE_SOURCE_MISSING = (
-    # Use for cycles stand-alone.
-    ("intern/cycles/util/CMakeLists.txt", "../../third_party/numaapi/include"),
+    (   # Use for cycles stand-alone.
+        "intern/cycles/util/CMakeLists.txt", (
+            "../../third_party/numaapi/include",
+        )),
+    (   # Use for `WITH_NANOVDB`.
+        "intern/cycles/kernel/CMakeLists.txt", (
+            "nanovdb/util/CSampleFromVoxels.h",
+            "nanovdb/util/SampleFromVoxels.h",
+            "nanovdb/NanoVDB.h",
+            "nanovdb/CNanoVDB.h",
+        ),
+    ),
 )
 
 IGNORE_CMAKE = (