Merge branch 'blender-v4.5-release'

intern/ghost/CMakeLists.txt

@@ -138,12 +138,17 @@ if(WITH_INPUT_NDOF)
     intern/GHOST_NDOFManager.hh
   )
 
-  list(APPEND INC_SYS
-    ${NDOF_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${NDOF_LIBRARIES}
-  )
+  # Only some platforms define this.
+  if(DEFINED NDOF_INCLUDE_DIRS)
+    list(APPEND INC_SYS
+      ${NDOF_INCLUDE_DIRS}
+    )
+  endif()
+  if(DEFINED NDOF_LIBRARIES)
+    list(APPEND LIB
+      ${NDOF_LIBRARIES}
+    )
+  endif()
 endif()
 
 list(APPEND SRC

source/blender/blenloader_core/CMakeLists.txt

@@ -6,6 +6,8 @@ set(INC
   PUBLIC .
 )
 
+set(INC_SYS
+)
 
 set(SRC
   intern/blo_core_bhead.cc

source/blender/gpu/GPU_worker.hh

@@ -16,9 +16,11 @@
 
 namespace blender::gpu {
 
-/* Abstracts the creation and management of secondary threads with GPU contexts.
+/**
+ * Abstracts the creation and management of secondary threads with GPU contexts.
  * Must be created from the main thread.
- * Threads and their context remain alive until destruction. */
+ * Threads and their context remain alive until destruction.
+ */
 class GPUWorker {
  private:
   Vector<std::unique_ptr<std::thread>> threads_;
@@ -28,9 +30,9 @@ class GPUWorker {
 
  public:
   enum class ContextType {
-    /* Use the main GPU context on the worker threads. */
+    /** Use the main GPU context on the worker threads. */
     Main,
-    /* Use a different secondary GPU context for each worker thread. */
+    /** Use a different secondary GPU context for each worker thread. */
     PerThread,
   };
 
@@ -38,7 +40,7 @@ class GPUWorker {
    * \param threads_count: Number of threads to span.
    * \param context_type: The type of context each thread uses.
    * \param mutex: Mutex used when trying to acquire the next work
-   *               (and reused internally for termation).
+   *               (and reused internally for termination).
    * \param pop_work: The callback function that will be called to acquire the next work,
    *                  should return a void pointer.
    *                  NOTE: The mutex is locked when this function is called.

tests/CMakeLists.txt

@@ -116,7 +116,7 @@ if(WITH_COMPILER_CODE_COVERAGE)
       BYPRODUCTS "${COMPILER_CODE_COVERAGE_DATA_DIR}/report/index.html"
       SOURCES "${COMPILER_CODE_COVERAGE_DATA_DIR}/blender.profdata"
       COMMENT "Generating code-coverage report."
-      COMMAND "${LLVM_COV}" show 
+      COMMAND "${LLVM_COV}" show
         -format=html
         -show-instantiations=true
         -show-line-counts-or-regions