Switch GCC version for buildbot builds to 10.

Builtbot is switching over from json to yaml. Both
configuration files should be kept in sync for now.

The json file will be removed when everything works as expected.

build_files/build_environment/CMakeLists.txt

@@ -82,7 +82,11 @@ if(UNIX)
 endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
-include(cmake/flexbison.cmake)
+if(WIN32)
+  include(cmake/flexbison.cmake)
+else()
+  include(cmake/flex.cmake)
+endif()
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)

build_files/build_environment/cmake/download.cmake

@@ -93,3 +93,4 @@ download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
 download_source(ZSTD)
+download_source(FLEX)

build_files/build_environment/cmake/flex.cmake

@@ -0,0 +1,28 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+ExternalProject_Add(external_flex
+  URL file://${PACKAGE_DIR}/${FLEX_FILE}
+  URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  PREFIX ${BUILD_DIR}/flex
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
+  INSTALL_DIR ${LIBDIR}/flex
+)

build_files/build_environment/cmake/harvest.cmake

@@ -106,6 +106,7 @@ harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 harvest(llvm/lib llvm/lib "libclang*.a")
+harvest(llvm/lib/clang llvm/lib/clang "*.h")
 if(APPLE)
   harvest(openmp/lib openmp/lib "*")
   harvest(openmp/include openmp/include "*.h")

build_files/build_environment/cmake/ispc.cmake

@@ -29,12 +29,13 @@ elseif(APPLE)
   if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex
+      -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
       -DARM_ENABLED=On
     )
   else()
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
+      -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
       -DARM_ENABLED=Off
     )
   endif()
@@ -43,6 +44,7 @@ elseif(UNIX)
     -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
     -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
     -DARM_ENABLED=Off
+    -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
   )
 endif()
 
@@ -82,4 +84,9 @@ if(WIN32)
     external_ispc
     external_flexbison
   )
+else()
+  add_dependencies(
+    external_ispc
+    external_flex
+  )
 endif()

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -45,7 +45,6 @@ ExternalProject_Add(external_openimagedenoise
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

build_files/build_environment/cmake/openmp.cmake

@@ -22,9 +22,8 @@ ExternalProject_Add(external_openmp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
   INSTALL_DIR ${LIBDIR}/openmp
 )
 

build_files/build_environment/cmake/osl.cmake

@@ -51,6 +51,7 @@ set(OSL_EXTRA_ARGS
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
+  -DPNG_ROOT=${LIBDIR}/png
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   ${OSL_FLEX_BISON}
@@ -69,13 +70,9 @@ set(OSL_EXTRA_ARGS
   ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
+  -DCMAKE_CXX_STANDARD=14
 )
 
-# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14
-if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
-  list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14)
-endif()
-
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -93,10 +90,20 @@ add_dependencies(
   ll
   external_openexr
   external_zlib
-  external_flexbison
   external_openimageio
   external_pugixml
 )
+if(WIN32)
+  add_dependencies(
+    external_osl
+    external_flexbison
+  )
+else()
+  add_dependencies(
+    external_osl
+    external_flex
+  )
+endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/versions.cmake

@@ -152,35 +152,20 @@ set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-if(BLENDER_PLATFORM_ARM)
-  # Newer version required by ISPC with arm support.
-  set(LLVM_VERSION 11.0.1)
-  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
-  set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_VERSION 12.0.0)
+set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
+set(LLVM_HASH_TYPE MD5)
+set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
 
-  set(OPENMP_VERSION 9.0.1)
-  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
-  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
-else()
-  set(LLVM_VERSION 9.0.1)
-  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
-  set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
+set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
+set(OPENMP_HASH_TYPE MD5)
+set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
 
-  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
-  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
-endif()
-
-set(OPENIMAGEIO_VERSION 2.1.15.0)
+set(OPENIMAGEIO_VERSION 2.2.15.1)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
+set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -190,9 +175,9 @@ set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.10.0)
+set(OSL_VERSION 1.11.14.1)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH dfdc23597aeef083832cbada62211756)
+set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -370,12 +355,18 @@ set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
 set(PUGIXML_HASH_TYPE MD5)
 set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
 
-set(FLEXBISON_VERSION 2.5.5)
+set(FLEXBISON_VERSION 2.5.24)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
-set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
+set(FLEXBISON_HASH 6b549d43e34ece0e8ed05af92daa31c4)
 set(FLEXBISON_HASH_TYPE MD5)
 set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
+set(FLEX_VERSION 2.6.4)
+set(FLEX_URI https://github.com/westes/flex/releases/download/v${FLEX_VERSION}/flex-${FLEX_VERSION}.tar.gz)
+set(FLEX_HASH 2882e3179748cc9f9c23ec593d6adc8d)
+set(FLEX_HASH_TYPE MD5)
+set(FLEX_FILE flex-${FLEX_VERSION}.tar.gz)
+
 # Libraries to keep Python modules static on Linux.
 
 # NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
@@ -432,9 +423,9 @@ set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.0)
+set(OIDN_VERSION 1.4.1)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH 421824019becc5b664a22a2b98332bc5)
+set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -444,10 +435,10 @@ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
 set(LIBGLU_HASH_TYPE MD5)
 set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
-set(MESA_VERSION 20.3.4)
+set(MESA_VERSION 21.1.5)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
-set(MESA_HASH_TYPE MD5)
+set(MESA_HASH 022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d)
+set(MESA_HASH_TYPE SHA256)
 set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
 
 set(NASM_VERSION 2.15.02)
@@ -468,19 +459,11 @@ set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/
 set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
 set(WL_PROTOCOLS_HASH_TYPE MD5)
 
-if(BLENDER_PLATFORM_ARM)
-  # Unreleased version with macOS arm support.
-  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
-  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
-else()
-  set(ISPC_VERSION v1.14.1)
-  set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-  set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
-endif()
+set(ISPC_VERSION v1.16.0)
+set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
+set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
+set(ISPC_HASH_TYPE MD5)
+set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)

build_files/build_environment/patches/oidn.diff

@@ -1,10 +0,0 @@
---- external_openimagedenoise/cmake/oidn_ispc.cmake	2021-02-15 17:29:34.000000000 +0100
-+++ external_openimagedenoise/cmake/oidn_ispc.cmake2	2021-02-15 17:29:28.000000000 +0100
-@@ -98,7 +98,7 @@
-   elseif(OIDN_ARCH STREQUAL "ARM64")
-     set(ISPC_ARCHITECTURE "aarch64")
-     if(APPLE)
--      set(ISPC_TARGET_OS "--target-os=ios")
-+      set(ISPC_TARGET_OS "--target-os=macos")
-     endif()
-   endif()

build_files/build_environment/patches/openimageio.diff

@@ -34,24 +34,3 @@ diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/incl
  #    include <windows.h>
  #endif
  
-diff -Naur orig/src/libutil/ustring.cpp external_openimageio/src/libutil/ustring.cpp
---- orig/src/libutil/ustring.cpp	2020-05-11 05:43:52.000000000 +0200
-+++ external_openimageio/src/libutil/ustring.cpp	2020-11-26 12:06:08.000000000 +0100
-@@ -337,6 +337,8 @@
-     // the std::string to make it point to our chars!  In such a case, the
-     // destructor will be careful not to allow a deallocation.
- 
-+    // Disable internal std::string for Apple silicon based Macs
-+#if !(defined(__APPLE__) && defined(__arm64__))
- #if defined(__GNUC__) && !defined(_LIBCPP_VERSION)                             \
-     && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI
-     // NEW gcc ABI
-@@ -382,7 +384,7 @@
-         return;
-     }
- #endif
--
-+#endif
-     // Remaining cases - just assign the internal string.  This may result
-     // in double allocation for the chars.  If you care about that, do
-     // something special for your platform, much like we did for gcc and

build_files/build_environment/patches/openmp.diff

@@ -1,23 +0,0 @@
-diff --git a/runtime/src/z_Linux_asm.S b/runtime/src/z_Linux_asm.S
-index 0d8885e..42aa5ad 100644
---- a/runtime/src/z_Linux_asm.S
-+++ b/runtime/src/z_Linux_asm.S
-@@ -1540,10 +1540,12 @@ __kmp_unnamed_critical_addr:
-     .comm .gomp_critical_user_,32,8
-     .data
-     .align 8
--    .global __kmp_unnamed_critical_addr
--__kmp_unnamed_critical_addr:
-+    .global ___kmp_unnamed_critical_addr
-+___kmp_unnamed_critical_addr:
-     .8byte .gomp_critical_user_
--    .size __kmp_unnamed_critical_addr,8
-+#  if !(KMP_OS_DARWIN)
-+    .size ___kmp_unnamed_critical_addr,8
-+#  endif
- #endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 */
- 
- #if KMP_OS_LINUX
-
-
-

build_files/build_environment/patches/osl.diff

@@ -63,19 +63,50 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt
 
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 445f6400..3d468de2 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
- #endif
-     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
- #if OSL_LLVM_VERSION >= 110
--    OSL_DASSERT(llvm::isa<llvm::Function>(func));
--    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
-+    llvm::Value* r = builder().CreateCall(
-+        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
-+        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
- #else
-     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 990f50d69..46ef7351d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+         FILE ${OSL_TARGETS_EXPORT_NAME}
+         NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++	osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+     include (packaging)
+diff -Naur external_osl_orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
+--- external_osl_orig/src/cmake/externalpackages.cmake  2021-06-01 13:44:18 -0600
++++ external_osl/src/cmake/externalpackages.cmake       2021-06-28 07:44:32 -0600
+@@ -80,6 +80,7 @@
+
+
+ checked_find_package (ZLIB REQUIRED)  # Needed by several packages
++checked_find_package (PNG REQUIRED)  # Needed since OIIO needs it
+
+ # IlmBase & OpenEXR
+ checked_find_package (OpenEXR REQUIRED
+diff -Naur external_osl_orig/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
+--- external_osl_orig/src/liboslcomp/oslcomp.cpp        2021-06-01 13:44:18 -0600
++++ external_osl/src/liboslcomp/oslcomp.cpp     2021-06-28 09:11:06 -0600
+@@ -21,6 +21,13 @@
+ #if !defined(__STDC_CONSTANT_MACROS)
+ #    define __STDC_CONSTANT_MACROS 1
  #endif
++
++// clang uses CALLBACK in its templates which causes issues if it is already defined
++#ifdef _WIN32 && defined(CALLBACK)
++#    undef CALLBACK
++#endif
++
++//
+ #include <clang/Basic/TargetInfo.h>
+ #include <clang/Frontend/CompilerInstance.h>
+ #include <clang/Frontend/TextDiagnosticPrinter.h>

build_files/cmake/cmake_netbeans_project.py

@@ -82,7 +82,7 @@ def create_nb_project_main():
         make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
         make_exe_basename = os.path.basename(make_exe)
 
-        # --------------- NB specific
+        # --------------- NetBeans specific.
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
         defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
 

build_files/cmake/platform/platform_apple.cmake

@@ -404,7 +404,7 @@ endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
-  if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     # Use OpenMP from our precompiled libraries.
     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
     set(OPENMP_CUSTOM ON)
@@ -480,10 +480,8 @@ else()
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
 endif()
 
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
-  # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
-  string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
-endif()
+# Clang has too low template depth of 128 for libmv.
+string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
 
 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.

build_files/config/pipeline_config.json

@@ -41,7 +41,7 @@
             },
             "cuda11":
             {
-                "version": "11.3"
+                "version": "11.4"
             }
         },
         "cmake":

build_files/config/pipeline_config.yaml

@@ -0,0 +1,70 @@
+#
+# Used by Buildbot build pipeline make_update.py script only for now
+# We intended to update the make_update.py in the branches to use this file eventually
+#
+update-code:
+    git:
+        submodules:
+        -   branch: master
+            commit_id: HEAD
+            path: release/scripts/addons
+        -   branch: master
+            commit_id: HEAD
+            path: release/scripts/addons_contrib
+        -   branch: master
+            commit_id: HEAD
+            path: release/datafiles/locale
+        -   branch: master
+            commit_id: HEAD
+            path: source/tools
+    svn:
+        libraries:
+            darwin-arm64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/darwin_arm64
+            darwin-x86_64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/darwin
+            linux-x86_64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/linux_centos7_x86_64
+            windows-amd64:
+                branch: trunk
+                commit_id: HEAD
+                path: lib/win64_vc15
+        tests:
+            branch: trunk
+            commit_id: HEAD
+            path: lib/tests
+        benchmarks:
+            branch: trunk
+            commit_id: HEAD
+            path: lib/benchmarks
+
+#
+# Buildbot only configs
+#
+buildbot:
+    gcc:
+        version: '10.0.0'
+    cuda10:
+        version: '10.1.0'
+    cuda11:
+        version: '11.4.0'
+    optix:
+        version: '7.1.0'
+    cmake:
+        default:
+            version: any
+            overrides: {}
+        darwin-arm64:
+            overrides: {}
+        darwin-x86_64:
+            overrides: {}
+        linux-x86_64:
+            overrides: {}
+        windows-amd64:
+            overrides: {}

doc/manpage/blender.1.py

@@ -122,7 +122,7 @@ is a full-featured 3D application. It supports the entirety of the 3D pipeline -
 '''modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
 
 Use Blender to create 3D images and animations, films and commercials, content for games, '''
-r'''architectural and industrial visualizatons, and scientific visualizations.
+r'''architectural and industrial visualizations, and scientific visualizations.
 
 https://www.blender.org''')
 

doc/python_api/sphinx_doc_gen.py

@@ -1047,6 +1047,7 @@ context_type_map = {
     "annotation_data": ("GreasePencil", False),
     "annotation_data_owner": ("ID", False),
     "armature": ("Armature", False),
+    "asset_library": ("AssetLibraryReference", False),
     "bone": ("Bone", False),
     "brush": ("Brush", False),
     "camera": ("Camera", False),
@@ -1113,6 +1114,7 @@ context_type_map = {
     "texture_slot": ("MaterialTextureSlot", False),
     "texture_user": ("ID", False),
     "texture_user_property": ("Property", False),
+    "ui_list": ("UIList", False),
     "vertex_paint_object": ("Object", False),
     "view_layer": ("ViewLayer", False),
     "visible_bones": ("EditBone", True),

extern/rangetree/intern/generic_alloc_impl.h

@@ -32,7 +32,7 @@
  * - #TPOOL_STRUCT: Name for pool struct name.
  * - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
  *
- * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
+ * \note #TPOOL_ALLOC_TYPE must be at least `sizeof(void *)`.
  *
  * Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
  *

intern/cycles/blender/addon/properties.py

@@ -263,6 +263,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Use Denoising",
         description="Denoise the rendered image",
         default=False,
+        update=update_render_passes,
     )
     use_preview_denoising: BoolProperty(
         name="Use Viewport Denoising",

intern/cycles/blender/addon/ui.py

@@ -1136,7 +1136,7 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
             col = row.column(align=True)
             col.operator("object.material_slot_add", icon='ADD', text="")
             col.operator("object.material_slot_remove", icon='REMOVE', text="")
-
+            col.separator()
             col.menu("MATERIAL_MT_context_menu", icon='DOWNARROW_HLT', text="")
 
             if is_sortable:
@@ -1151,16 +1151,15 @@ class CYCLES_PT_context_material(CyclesButtonsPanel, Panel):
                 row.operator("object.material_slot_select", text="Select")
                 row.operator("object.material_slot_deselect", text="Deselect")
 
-        split = layout.split(factor=0.65)
+        row = layout.row()
 
         if ob:
-            split.template_ID(ob, "active_material", new="material.new")
-            row = split.row()
+            row.template_ID(ob, "active_material", new="material.new")
 
             if slot:
-                row.prop(slot, "link", text="")
-            else:
-                row.label()
+                icon_link = 'MESH_DATA' if slot.link == 'DATA' else 'OBJECT_DATA'
+                row.prop(slot, "link", text="", icon=icon_link, icon_only=True)
+
         elif mat:
             split.template_ID(space, "pin_id")
             split.separator()

intern/cycles/device/cuda/device_cuda_impl.cpp

@@ -461,18 +461,19 @@ string CUDADevice::compile_kernel(const DeviceRequestedFeatures &requested_featu
 
   const int nvcc_cuda_version = cuewCompilerVersion();
   VLOG(1) << "Found nvcc " << nvcc << ", CUDA version " << nvcc_cuda_version << ".";
-  if (nvcc_cuda_version < 80) {
+  if (nvcc_cuda_version < 101) {
     printf(
         "Unsupported CUDA version %d.%d detected, "
-        "you need CUDA 8.0 or newer.\n",
+        "you need CUDA 10.1 or newer.\n",
         nvcc_cuda_version / 10,
         nvcc_cuda_version % 10);
     return string();
   }
-  else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102)) {
+  else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102 || nvcc_cuda_version == 111 ||
+             nvcc_cuda_version == 112 || nvcc_cuda_version == 113 || nvcc_cuda_version == 114)) {
     printf(
         "CUDA version %d.%d detected, build may succeed but only "
-        "CUDA 10.1 and 10.2 are officially supported.\n",
+        "CUDA 10.1 to 11.4 are officially supported.\n",
         nvcc_cuda_version / 10,
         nvcc_cuda_version % 10);
   }

intern/cycles/kernel/CMakeLists.txt

@@ -380,11 +380,16 @@ if(WITH_CYCLES_CUDA_BINARIES)
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
 
   # warn for other versions
-  if((CUDA_VERSION MATCHES "101") OR (CUDA_VERSION MATCHES "102") OR (CUDA_VERSION MATCHES "111"))
+  if((CUDA_VERSION MATCHES "101") OR
+     (CUDA_VERSION MATCHES "102") OR
+     (CUDA_VERSION MATCHES "111") OR
+     (CUDA_VERSION MATCHES "112") OR
+     (CUDA_VERSION MATCHES "113") OR
+     (CUDA_VERSION MATCHES "114"))
   else()
     message(WARNING
       "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
-      "build may succeed but only CUDA 10.1, 10.2 and 11.1 are officially supported")
+      "build may succeed but only CUDA 10.1 to 11.4 are officially supported")
   endif()
 
   # build for each arch

intern/cycles/render/colorspace.cpp

@@ -385,7 +385,7 @@ void ColorSpaceManager::free_memory()
 {
 #ifdef WITH_OCIO
   map_free_memory(cached_colorspaces);
-  map_free_memory(cached_colorspaces);
+  map_free_memory(cached_processors);
 #endif
 }
 

intern/cycles/render/osl.cpp

@@ -993,7 +993,7 @@ void OSLCompiler::parameter_array(const char *name, const float f[], int arrayle
 
 void OSLCompiler::parameter_color_array(const char *name, const array<float3> &f)
 {
-  /* NB: cycles float3 type is actually 4 floats! need to use an explicit array */
+  /* NOTE: cycles float3 type is actually 4 floats! need to use an explicit array. */
   array<float[3]> table(f.size());
 
   for (int i = 0; i < f.size(); ++i) {

intern/cycles/util/util_math_fast.h

@@ -103,7 +103,7 @@ ccl_device float fast_sinf(float x)
    * 1.19209e-07 max error
    */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = q;
+  float qf = (float)q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -132,7 +132,7 @@ ccl_device float fast_cosf(float x)
 {
   /* Same argument reduction as fast_sinf(). */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = q;
+  float qf = (float)q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -160,7 +160,7 @@ ccl_device void fast_sincosf(float x, float *sine, float *cosine)
 {
   /* Same argument reduction as fast_sin. */
   int q = fast_rint(x * M_1_PI_F);
-  float qf = q;
+  float qf = (float)q;
   x = madd(qf, -0.78515625f * 4, x);
   x = madd(qf, -0.00024187564849853515625f * 4, x);
   x = madd(qf, -3.7747668102383613586e-08f * 4, x);
@@ -207,7 +207,7 @@ ccl_device float fast_tanf(float x)
    * we sometimes need to take the reciprocal of the polynomial
    */
   int q = fast_rint(x * 2.0f * M_1_PI_F);
-  float qf = q;
+  float qf = (float)q;
   x = madd(qf, -0.78515625f * 2, x);
   x = madd(qf, -0.00024187564849853515625f * 2, x);
   x = madd(qf, -3.7747668102383613586e-08f * 2, x);
@@ -407,7 +407,7 @@ ccl_device float fast_logb(float x)
   x = fabsf(x);
   x = clamp(x, FLT_MIN, FLT_MAX);
   unsigned bits = __float_as_uint(x);
-  return (int)(bits >> 23) - 127;
+  return (float)((int)(bits >> 23) - 127);
 }
 
 ccl_device float fast_exp2f(float x)

intern/ghost/GHOST_C-api.h

@@ -188,8 +188,8 @@ extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
                                              GHOST_GLSettings glSettings);
 
 /**
- * Create a new offscreen context.
- * Never explicitly delete the context, use disposeContext() instead.
+ * Create a new off-screen context.
+ * Never explicitly delete the context, use #disposeContext() instead.
  * \param systemhandle: The handle to the system.
  * \param platform_support_callback: An optional callback to check platform support.
  * \return A handle to the new context ( == NULL if creation failed).
@@ -628,7 +628,7 @@ extern void GHOST_ScreenToClient(
     GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
 
 /**
- * Converts a point in screen coordinates to client rectangle coordinates
+ * Converts a point in client rectangle coordinates to screen coordinates.
  * \param windowhandle: The handle to the window.
  * \param inX: The x-coordinate in the client rectangle.
  * \param inY: The y-coordinate in the client rectangle.

intern/ghost/GHOST_IContext.h

@@ -29,8 +29,8 @@
 /**
  * Interface for GHOST context.
  *
- * You can create a offscreen context (windowless) with the system's
- * GHOST_ISystem::createOffscreenContext method.
+ * You can create a off-screen context (windowless) with the system's
+ * #GHOST_ISystem::createOffscreenContext method.
  * \see GHOST_ISystem#createOffscreenContext
  */
 class GHOST_IContext {

intern/ghost/GHOST_ISystem.h

@@ -261,8 +261,8 @@ class GHOST_ISystem {
   virtual GHOST_TSuccess disposeWindow(GHOST_IWindow *window) = 0;
 
   /**
-   * Create a new offscreen context.
-   * Never explicitly delete the context, use disposeContext() instead.
+   * Create a new off-screen context.
+   * Never explicitly delete the context, use #disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   virtual GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings) = 0;

intern/ghost/GHOST_IWindow.h

@@ -133,7 +133,7 @@ class GHOST_IWindow {
   virtual void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
 
   /**
-   * Converts a point in screen coordinates to client rectangle coordinates
+   * Converts a point in client rectangle coordinates to screen coordinates.
    * \param inX: The x-coordinate in the client rectangle.
    * \param inY: The y-coordinate in the client rectangle.
    * \param outX: The x-coordinate on the screen.

intern/ghost/GHOST_Types.h

@@ -611,9 +611,9 @@ typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, uint64_
 struct GHOST_XrDrawViewInfo;
 struct GHOST_XrError;
 /**
- * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL. An
- * offscreen texture of the viewport will then be drawn into using OpenGL, but the final texture
- * draw call will happen through another lib (say DirectX).
+ * The XR view (i.e. the OpenXR runtime) may require a different graphics library than OpenGL.
+ * An off-screen texture of the viewport will then be drawn into using OpenGL,
+ * but the final texture draw call will happen through another library (say DirectX).
  *
  * This enum defines the possible graphics bindings to attempt to enable.
  */
@@ -683,6 +683,10 @@ typedef struct GHOST_XrDrawViewInfo {
 
   /** Set if the buffer should be submitted with a SRGB transfer applied. */
   char expects_srgb_buffer;
+
+  /** The view that this info represents. Not necessarily the "eye index" (e.g. for quad view
+   * systems, etc). */
+  char view_idx;
 } GHOST_XrDrawViewInfo;
 
 typedef struct GHOST_XrError {

intern/ghost/intern/GHOST_ContextCGL.mm

@@ -217,7 +217,7 @@ static void makeAttribList(std::vector<NSOpenGLPixelFormatAttribute> &attribs,
   attribs.push_back(NSOpenGLPFAOpenGLProfile);
   attribs.push_back(coreProfile ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy);
 
-  // Pixel Format Attributes for the windowed NSOpenGLContext
+  /* Pixel Format Attributes for the windowed NSOpenGLContext. */
   attribs.push_back(NSOpenGLPFADoubleBuffer);
 
   if (softwareGL) {
@@ -250,7 +250,8 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
   static const bool needAlpha = false;
 #endif
 
-  static bool softwareGL = getenv("BLENDER_SOFTWAREGL");  // command-line argument would be better
+  /* Command-line argument would be better. */
+  static bool softwareGL = getenv("BLENDER_SOFTWAREGL");
 
   std::vector<NSOpenGLPixelFormatAttribute> attribs;
   attribs.reserve(40);
@@ -287,7 +288,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
 
   if (m_metalView) {
     if (m_defaultFramebuffer == 0) {
-      // Create a virtual framebuffer
+      /* Create a virtual frame-buffer. */
       [m_openGLContext makeCurrentContext];
       metalInitFramebuffer();
       initClearGL();
@@ -342,11 +343,11 @@ void GHOST_ContextCGL::metalInit()
     /* clang-format on */
     id<MTLDevice> device = m_metalLayer.device;
 
-    // Create a command queue for blit/present operation
+    /* Create a command queue for blit/present operation. */
     m_metalCmdQueue = (MTLCommandQueue *)[device newCommandQueue];
     [m_metalCmdQueue retain];
 
-    // Create shaders for blit operation
+    /* Create shaders for blit operation. */
     NSString *source = @R"msl(
       using namespace metal;
 
@@ -387,7 +388,7 @@ void GHOST_ContextCGL::metalInit()
           "GHOST_ContextCGL::metalInit: newLibraryWithSource:options:error: failed!");
     }
 
-    // Create a render pipeline for blit operation
+    /* Create a render pipeline for blit operation. */
     MTLRenderPipelineDescriptor *desc = [[[MTLRenderPipelineDescriptor alloc] init] autorelease];
 
     desc.fragmentFunction = [library newFunctionWithName:@"fragment_shader"];
@@ -460,7 +461,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
         "GHOST_ContextCGL::metalUpdateFramebuffer: CVPixelBufferCreate failed!");
   }
 
-  // Create an OpenGL texture
+  /* Create an OpenGL texture. */
   CVOpenGLTextureCacheRef cvGLTexCache = nil;
   cvret = CVOpenGLTextureCacheCreate(kCFAllocatorDefault,
                                      nil,
@@ -485,7 +486,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
   unsigned int glTex;
   glTex = CVOpenGLTextureGetName(cvGLTex);
 
-  // Create a Metal texture
+  /* Create a Metal texture. */
   CVMetalTextureCacheRef cvMetalTexCache = nil;
   cvret = CVMetalTextureCacheCreate(
       kCFAllocatorDefault, nil, m_metalLayer.device, nil, &cvMetalTexCache);

intern/ghost/intern/GHOST_ContextEGL.cpp

@@ -283,8 +283,8 @@ GHOST_TSuccess GHOST_ContextEGL::setSwapInterval(int interval)
 
 GHOST_TSuccess GHOST_ContextEGL::getSwapInterval(int &intervalOut)
 {
-  // This is a bit of a kludge because there does not seem to
-  // be a way to query the swap interval with EGL.
+  /* This is a bit of a kludge because there does not seem to
+   * be a way to query the swap interval with EGL. */
   intervalOut = m_swap_interval;
 
   return GHOST_kSuccess;
@@ -365,21 +365,21 @@ static const std::string &api_string(EGLenum api)
 
 GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
 {
-  // objects have to be declared here due to the use of goto
+  /* Objects have to be declared here due to the use of `goto`. */
   std::vector<EGLint> attrib_list;
   EGLint num_config = 0;
 
   if (m_stereoVisual)
     fprintf(stderr, "Warning! Stereo OpenGL ES contexts are not supported.\n");
 
-  m_stereoVisual = false;  // It doesn't matter what the Window wants.
+  m_stereoVisual = false; /* It doesn't matter what the Window wants. */
 
   if (!initContextEGLEW()) {
     return GHOST_kFailure;
   }
 
 #ifdef WITH_GL_ANGLE
-  // d3dcompiler_XX.dll needs to be loaded before ANGLE will work
+  /* `d3dcompiler_XX.dll` needs to be loaded before ANGLE will work. */
   if (s_d3dcompiler == NULL) {
     s_d3dcompiler = LoadLibrary(D3DCOMPILER);
 
@@ -410,13 +410,13 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
   if (!bindAPI(m_api))
     goto error;
 
-  // build attribute list
+  /* Build attribute list. */
 
   attrib_list.reserve(20);
 
   if (m_api == EGL_OPENGL_ES_API && EGLEW_VERSION_1_2) {
-    // According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
-    // but some implementations (ANGLE) do not seem to care.
+    /* According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
+     * but some implementations (ANGLE) do not seem to care. */
 
     if (m_contextMajorVersion == 1) {
       attrib_list.push_back(EGL_RENDERABLE_TYPE);
@@ -469,7 +469,7 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
 #endif
 
   if (m_nativeWindow == 0) {
-    // off-screen surface
+    /* Off-screen surface. */
     attrib_list.push_back(EGL_SURFACE_TYPE);
     attrib_list.push_back(EGL_PBUFFER_BIT);
   }
@@ -479,8 +479,8 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
   if (!EGL_CHK(::eglChooseConfig(m_display, &(attrib_list[0]), &m_config, 1, &num_config)))
     goto error;
 
-  // A common error is to assume that ChooseConfig worked because it returned EGL_TRUE
-  if (num_config != 1)  // num_config should be exactly 1
+  /* A common error is to assume that ChooseConfig worked because it returned EGL_TRUE. */
+  if (num_config != 1) /* `num_config` should be exactly 1. */
     goto error;
 
   if (m_nativeWindow != 0) {

intern/ghost/intern/GHOST_ContextGLX.cpp

@@ -239,7 +239,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
     }
     attribs[i++] = 0;
 
-    /* Some drivers don't like having a true offscreen context.
+    /* Some drivers don't like having a true off-screen context.
      * Create a pixel buffer instead of a window to render to.
      * even if it will never be used for drawing. */
     int pbuffer_attribs[] = {GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, None};

intern/ghost/intern/GHOST_ContextWGL.cpp

@@ -335,10 +335,11 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD)
   if (!WIN32_CHK(::wglMakeCurrent(dummyHDC, dummyHGLRC)))
     goto finalize;
 
-  if (GLEW_CHK(glewInit()) != GLEW_OK)
+  if (GLEW_CHK(glewInit()) != GLEW_OK) {
     fprintf(stderr, "Warning! Dummy GLEW/WGLEW failed to initialize properly.\n");
+  }
 
-    // the following are not technially WGLEW, but they also require a context to work
+  /* The following are not technically WGLEW, but they also require a context to work. */
 
 #ifndef NDEBUG
   free((void *)m_dummyRenderer);

intern/ghost/intern/GHOST_DisplayManager.cpp

@@ -51,7 +51,7 @@ GHOST_TSuccess GHOST_DisplayManager::initialize(void)
 
 GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(uint8_t & /*numDisplays*/) const
 {
-  // Don't know if we have a display...
+  /* Don't know if we have a display. */
   return GHOST_kFailure;
 }
 
@@ -120,18 +120,18 @@ GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
       (int)setting.xPixels, (int)setting.yPixels, (int)setting.bpp, (int)setting.frequency};
   int capabilities[4];
   double field, score;
-  double best = 1e12;  // A big number
+  double best = 1e12; /* A big number. */
   int found = 0;
 
-  // Look at all the display modes
+  /* Look at all the display modes. */
   for (int i = 0; (i < (int)m_settings[display].size()); i++) {
-    // Store the capabilities of the display device
+    /* Store the capabilities of the display device. */
     capabilities[0] = m_settings[display][i].xPixels;
     capabilities[1] = m_settings[display][i].yPixels;
     capabilities[2] = m_settings[display][i].bpp;
     capabilities[3] = m_settings[display][i].frequency;
 
-    // Match against all the fields of the display settings
+    /* Match against all the fields of the display settings. */
     score = 0;
     for (int j = 0; j < 4; j++) {
       field = capabilities[j] - criteria[j];

intern/ghost/intern/GHOST_DropTargetX11.cpp

@@ -115,8 +115,10 @@ GHOST_DropTargetX11::~GHOST_DropTargetX11()
 /* Based on: https://stackoverflow.com/a/2766963/432509 */
 
 typedef enum DecodeState_e {
-  STATE_SEARCH = 0,  ///< searching for an ampersand to convert
-  STATE_CONVERTING   ///< convert the two proceeding characters from hex
+  /** Searching for an ampersand to convert. */
+  STATE_SEARCH = 0,
+  /** Convert the two proceeding characters from hex. */
+  STATE_CONVERTING
 } DecodeState_e;
 
 void GHOST_DropTargetX11::UrlDecode(char *decodedOut, int bufferSize, const char *encodedIn)

intern/ghost/intern/GHOST_EventDragnDrop.h

@@ -90,7 +90,7 @@ class GHOST_EventDragnDrop : public GHOST_Event {
 
   ~GHOST_EventDragnDrop()
   {
-    // Free the dropped object data
+    /* Free the dropped object data. */
     if (m_dragnDropEventData.data == NULL)
       return;
 

intern/ghost/intern/GHOST_EventManager.cpp

@@ -108,12 +108,12 @@ GHOST_TSuccess GHOST_EventManager::addConsumer(GHOST_IEventConsumer *consumer)
   GHOST_TSuccess success;
   GHOST_ASSERT(consumer, "invalid consumer");
 
-  // Check to see whether the consumer is already in our list
+  /* Check to see whether the consumer is already in our list. */
   TConsumerVector::const_iterator iter = std::find(
       m_consumers.begin(), m_consumers.end(), consumer);
 
   if (iter == m_consumers.end()) {
-    // Add the consumer
+    /* Add the consumer. */
     m_consumers.push_back(consumer);
     success = GHOST_kSuccess;
   }
@@ -128,11 +128,11 @@ GHOST_TSuccess GHOST_EventManager::removeConsumer(GHOST_IEventConsumer *consumer
   GHOST_TSuccess success;
   GHOST_ASSERT(consumer, "invalid consumer");
 
-  // Check to see whether the consumer is in our list
+  /* Check to see whether the consumer is in our list. */
   TConsumerVector::iterator iter = std::find(m_consumers.begin(), m_consumers.end(), consumer);
 
   if (iter != m_consumers.end()) {
-    // Remove the consumer
+    /* Remove the consumer. */
     m_consumers.erase(iter);
     success = GHOST_kSuccess;
   }

intern/ghost/intern/GHOST_ISystem.cpp

@@ -60,6 +60,8 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
     }
     catch (const std::runtime_error &) {
       /* fallback to X11. */
+      delete m_system;
+      m_system = nullptr;
     }
     if (!m_system) {
       m_system = new GHOST_SystemX11();

intern/ghost/intern/GHOST_NDOFManager.cpp

@@ -22,51 +22,51 @@
 
 #include <limits.h>
 #include <math.h>
-#include <stdio.h>   // for error/info reporting
-#include <string.h>  // for memory functions
+#include <stdio.h>  /* For error/info reporting. */
+#include <string.h> /* For memory functions. */
 
 #ifdef DEBUG_NDOF_MOTION
-// printable version of each GHOST_TProgress value
+/* Printable version of each GHOST_TProgress value. */
 static const char *progress_string[] = {
     "not started", "starting", "in progress", "finishing", "finished"};
 #endif
 
 #ifdef DEBUG_NDOF_BUTTONS
 static const char *ndof_button_names[] = {
-    // used internally, never sent
+    /* used internally, never sent */
     "NDOF_BUTTON_NONE",
-    // these two are available from any 3Dconnexion device
+    /* these two are available from any 3Dconnexion device */
     "NDOF_BUTTON_MENU",
     "NDOF_BUTTON_FIT",
-    // standard views
+    /* standard views */
     "NDOF_BUTTON_TOP",
     "NDOF_BUTTON_BOTTOM",
     "NDOF_BUTTON_LEFT",
     "NDOF_BUTTON_RIGHT",
     "NDOF_BUTTON_FRONT",
     "NDOF_BUTTON_BACK",
-    // more views
+    /* more views */
     "NDOF_BUTTON_ISO1",
     "NDOF_BUTTON_ISO2",
-    // 90 degree rotations
+    /* 90 degree rotations */
     "NDOF_BUTTON_ROLL_CW",
     "NDOF_BUTTON_ROLL_CCW",
     "NDOF_BUTTON_SPIN_CW",
     "NDOF_BUTTON_SPIN_CCW",
     "NDOF_BUTTON_TILT_CW",
     "NDOF_BUTTON_TILT_CCW",
-    // device control
+    /* device control */
     "NDOF_BUTTON_ROTATE",
     "NDOF_BUTTON_PANZOOM",
     "NDOF_BUTTON_DOMINANT",
     "NDOF_BUTTON_PLUS",
     "NDOF_BUTTON_MINUS",
-    // keyboard emulation
+    /* keyboard emulation */
     "NDOF_BUTTON_ESC",
     "NDOF_BUTTON_ALT",
     "NDOF_BUTTON_SHIFT",
     "NDOF_BUTTON_CTRL",
-    // general-purpose buttons
+    /* general-purpose buttons */
     "NDOF_BUTTON_1",
     "NDOF_BUTTON_2",
     "NDOF_BUTTON_3",
@@ -77,17 +77,17 @@ static const char *ndof_button_names[] = {
     "NDOF_BUTTON_8",
     "NDOF_BUTTON_9",
     "NDOF_BUTTON_10",
-    // more general-purpose buttons
+    /* more general-purpose buttons */
     "NDOF_BUTTON_A",
     "NDOF_BUTTON_B",
     "NDOF_BUTTON_C",
-    // the end
+    /* the end */
     "NDOF_BUTTON_LAST"};
 #endif
 
-// shared by the latest 3Dconnexion hardware
-// SpacePilotPro uses all of these
-// smaller devices use only some, based on button mask
+/* Shared by the latest 3Dconnexion hardware
+ * SpacePilotPro uses all of these
+ * smaller devices use only some, based on button mask. */
 static const NDOF_ButtonT Modern3Dx_HID_map[] = {
     NDOF_BUTTON_MENU,     NDOF_BUTTON_FIT,      NDOF_BUTTON_TOP,    NDOF_BUTTON_LEFT,
     NDOF_BUTTON_RIGHT,    NDOF_BUTTON_FRONT,    NDOF_BUTTON_BOTTOM, NDOF_BUTTON_BACK,
@@ -116,15 +116,15 @@ static const NDOF_ButtonT SpaceExplorer_HID_map[] = {
     NDOF_BUTTON_ROTATE,
 };
 
-// this is the older SpacePilot (sans Pro)
-// thanks to polosson for info about this device
+/* This is the older SpacePilot (sans Pro)
+ * thanks to polosson for info about this device. */
 static const NDOF_ButtonT SpacePilot_HID_map[] = {
     NDOF_BUTTON_1,     NDOF_BUTTON_2,     NDOF_BUTTON_3,        NDOF_BUTTON_4,
     NDOF_BUTTON_5,     NDOF_BUTTON_6,     NDOF_BUTTON_TOP,      NDOF_BUTTON_LEFT,
     NDOF_BUTTON_RIGHT, NDOF_BUTTON_FRONT, NDOF_BUTTON_ESC,      NDOF_BUTTON_ALT,
     NDOF_BUTTON_SHIFT, NDOF_BUTTON_CTRL,  NDOF_BUTTON_FIT,      NDOF_BUTTON_MENU,
     NDOF_BUTTON_PLUS,  NDOF_BUTTON_MINUS, NDOF_BUTTON_DOMINANT, NDOF_BUTTON_ROTATE,
-    NDOF_BUTTON_NONE  // the CONFIG button -- what does it do?
+    NDOF_BUTTON_NONE /* the CONFIG button -- what does it do? */
 };
 
 static const NDOF_ButtonT Generic_HID_map[] = {
@@ -146,7 +146,7 @@ static const int genericButtonCount = sizeof(Generic_HID_map) / sizeof(NDOF_Butt
 
 GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System &sys)
     : m_system(sys),
-      m_deviceType(NDOF_UnknownDevice),  // each platform has its own device detection code
+      m_deviceType(NDOF_UnknownDevice), /* Each platform has its own device detection code. */
       m_buttonCount(genericButtonCount),
       m_buttonMask(0),
       m_hidMap(Generic_HID_map),
@@ -157,37 +157,37 @@ GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System &sys)
       m_motionEventPending(false),
       m_deadZone(0.0f)
 {
-  // to avoid the rare situation where one triple is updated and
-  // the other is not, initialize them both here:
+  /* To avoid the rare situation where one triple is updated and
+   * the other is not, initialize them both here: */
   memset(m_translation, 0, sizeof(m_translation));
   memset(m_rotation, 0, sizeof(m_rotation));
 }
 
 bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short product_id)
 {
-  // call this function until it returns true
-  // it's a good idea to stop calling it after that, as it will "forget"
-  // whichever device it already found
+  /* Call this function until it returns true
+   * it's a good idea to stop calling it after that, as it will "forget"
+   * whichever device it already found */
 
-  // default to safe generic behavior for "unknown" devices
-  // unidentified devices will emit motion events like normal
-  // rogue buttons do nothing by default, but can be customized by the user
+  /* Default to safe generic behavior for "unknown" devices
+   * unidentified devices will emit motion events like normal
+   * rogue buttons do nothing by default, but can be customized by the user. */
 
   m_deviceType = NDOF_UnknownDevice;
   m_hidMap = Generic_HID_map;
   m_buttonCount = genericButtonCount;
   m_buttonMask = 0;
 
-  // "mystery device" owners can help build a HID_map for their hardware
-  // A few users have already contributed information about several older devices
-  // that I don't have access to. Thanks!
+  /* "mystery device" owners can help build a HID_map for their hardware
+   * A few users have already contributed information about several older devices
+   * that I don't have access to. Thanks! */
 
   switch (vendor_id) {
-    case 0x046D:  // Logitech (3Dconnexion was a subsidiary)
+    case 0x046D: /* Logitech (3Dconnexion was a subsidiary). */
       switch (product_id) {
-        // -- current devices --
-        case 0xC626:  // full-size SpaceNavigator
-        case 0xC628:  // the "for Notebooks" one
+        /* -- current devices -- */
+        case 0xC626: /* full-size SpaceNavigator */
+        case 0xC628: /* the "for Notebooks" one */
           puts("ndof: using SpaceNavigator");
           m_deviceType = NDOF_SpaceNavigator;
           m_buttonCount = 2;
@@ -209,12 +209,12 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
           puts("ndof: using SpaceMouse Pro");
           m_deviceType = NDOF_SpaceMousePro;
           m_buttonCount = 27;
-          // ^^ actually has 15 buttons, but their HID codes range from 0 to 26
+          /* ^^ actually has 15 buttons, but their HID codes range from 0 to 26 */
           m_buttonMask = 0x07C0F137;
           m_hidMap = Modern3Dx_HID_map;
           break;
 
-        // -- older devices --
+        /* -- older devices -- */
         case 0xC625:
           puts("ndof: using SpacePilot");
           m_deviceType = NDOF_SpacePilot;
@@ -236,21 +236,21 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
           printf("ndof: unknown Logitech product %04hx\n", product_id);
       }
       break;
-    case 0x256F:  // 3Dconnexion
+    case 0x256F: /* 3Dconnexion */
       switch (product_id) {
-        case 0xC62E:  // plugged in
-        case 0xC62F:  // wireless
+        case 0xC62E: /* Plugged in. */
+        case 0xC62F: /* Wireless. */
           puts("ndof: using SpaceMouse Wireless");
           m_deviceType = NDOF_SpaceMouseWireless;
           m_buttonCount = 2;
           m_hidMap = Modern3Dx_HID_map;
           break;
-        case 0xC631:  // plugged in
-        case 0xC632:  // wireless
+        case 0xC631: /* Plugged in. */
+        case 0xC632: /* Wireless. */
           puts("ndof: using SpaceMouse Pro Wireless");
           m_deviceType = NDOF_SpaceMouseProWireless;
           m_buttonCount = 27;
-          // ^^ actually has 15 buttons, but their HID codes range from 0 to 26
+          /* ^^ actually has 15 buttons, but their HID codes range from 0 to 26. */
           m_buttonMask = 0x07C0F137;
           m_hidMap = Modern3Dx_HID_map;
           break;
@@ -364,16 +364,16 @@ void GHOST_NDOFManager::updateButton(int button_number, bool press, uint64_t tim
 
   int mask = 1 << button_number;
   if (press) {
-    m_buttons |= mask;  // set this button's bit
+    m_buttons |= mask; /* Set this button's bit. */
   }
   else {
-    m_buttons &= ~mask;  // clear this button's bit
+    m_buttons &= ~mask; /* Clear this button's bit. */
   }
 }
 
 void GHOST_NDOFManager::updateButtons(int button_bits, uint64_t time)
 {
-  button_bits &= m_buttonMask;  // discard any "garbage" bits
+  button_bits &= m_buttonMask; /* Discard any "garbage" bits. */
 
   int diff = m_buttons ^ button_bits;
 
@@ -390,11 +390,11 @@ void GHOST_NDOFManager::updateButtons(int button_bits, uint64_t time)
 void GHOST_NDOFManager::setDeadZone(float dz)
 {
   if (dz < 0.0f) {
-    // negative values don't make sense, so clamp at zero
+    /* Negative values don't make sense, so clamp at zero. */
     dz = 0.0f;
   }
   else if (dz > 0.5f) {
-    // warn the rogue user/developer, but allow it
+    /* Warn the rogue user/developer, but allow it. */
     GHOST_PRINTF("ndof: dead zone of %.2f is rather high...\n", dz);
   }
   m_deadZone = dz;
@@ -426,22 +426,22 @@ bool GHOST_NDOFManager::sendMotionEvent()
   if (!m_motionEventPending)
     return false;
 
-  m_motionEventPending = false;  // any pending motion is handled right now
+  m_motionEventPending = false; /* Any pending motion is handled right now. */
 
   GHOST_IWindow *window = m_system.getWindowManager()->getActiveWindow();
 
   if (window == NULL) {
-    m_motionState = GHOST_kNotStarted;  // avoid large 'dt' times when changing windows
-    return false;                       // delivery will fail, so don't bother sending
+    m_motionState = GHOST_kNotStarted; /* Avoid large `dt` times when changing windows. */
+    return false;                      /* Delivery will fail, so don't bother sending. */
   }
 
   GHOST_EventNDOFMotion *event = new GHOST_EventNDOFMotion(m_motionTime, window);
   GHOST_TEventNDOFMotionData *data = (GHOST_TEventNDOFMotionData *)event->getData();
 
-  // scale axis values here to normalize them to around +/- 1
-  // they are scaled again for overall sensitivity in the WM based on user prefs
+  /* Scale axis values here to normalize them to around +/- 1
+   * they are scaled again for overall sensitivity in the WM based on user preferences. */
 
-  const float scale = 1.0f / 350.0f;  // 3Dconnexion devices send +/- 350 usually
+  const float scale = 1.0f / 350.0f; /* 3Dconnexion devices send +/- 350 usually */
 
   data->tx = scale * m_translation[0];
   data->ty = scale * m_translation[1];
@@ -451,24 +451,24 @@ bool GHOST_NDOFManager::sendMotionEvent()
   data->ry = scale * m_rotation[1];
   data->rz = scale * m_rotation[2];
 
-  data->dt = 0.001f * (m_motionTime - m_prevMotionTime);  // in seconds
+  data->dt = 0.001f * (m_motionTime - m_prevMotionTime); /* In seconds. */
   m_prevMotionTime = m_motionTime;
 
   bool weHaveMotion = !nearHomePosition(data, m_deadZone);
 
-  // determine what kind of motion event to send (Starting, InProgress, Finishing)
-  // and where that leaves this NDOF manager (NotStarted, InProgress, Finished)
+  /* Determine what kind of motion event to send `(Starting, InProgress, Finishing)`
+   * and where that leaves this NDOF manager `(NotStarted, InProgress, Finished)`. */
   switch (m_motionState) {
     case GHOST_kNotStarted:
     case GHOST_kFinished:
       if (weHaveMotion) {
         data->progress = GHOST_kStarting;
         m_motionState = GHOST_kInProgress;
-        // prev motion time will be ancient, so just make up a reasonable time delta
+        /* Previous motion time will be ancient, so just make up a reasonable time delta. */
         data->dt = 0.0125f;
       }
       else {
-        // send no event and keep current state
+        /* Send no event and keep current state. */
 #ifdef DEBUG_NDOF_MOTION
         printf("ndof motion ignored -- %s\n", progress_string[data->progress]);
 #endif
@@ -479,20 +479,22 @@ bool GHOST_NDOFManager::sendMotionEvent()
     case GHOST_kInProgress:
       if (weHaveMotion) {
         data->progress = GHOST_kInProgress;
-        // remain 'InProgress'
+        /* Remain 'InProgress'. */
       }
       else {
         data->progress = GHOST_kFinishing;
         m_motionState = GHOST_kFinished;
       }
       break;
-    default:;  // will always be one of the above
+    default:
+      /* Will always be one of the above. */
+      break;
   }
 
 #ifdef DEBUG_NDOF_MOTION
   printf("ndof motion sent -- %s\n", progress_string[data->progress]);
 
-  // show details about this motion event
+  /* Show details about this motion event. */
   printf("    T=(%d,%d,%d) R=(%d,%d,%d) raw\n",
          m_translation[0],
          m_translation[1],

intern/ghost/intern/GHOST_NDOFManager.h

@@ -28,7 +28,7 @@
 typedef enum {
   NDOF_UnknownDevice,
 
-  // current devices
+  /* Current devices. */
   NDOF_SpaceNavigator,
   NDOF_SpaceExplorer,
   NDOF_SpacePilotPro,
@@ -37,51 +37,51 @@ typedef enum {
   NDOF_SpaceMouseProWireless,
   NDOF_SpaceMouseEnterprise,
 
-  // older devices
+  /* Older devices. */
   NDOF_SpacePilot,
   NDOF_Spaceball5000,
   NDOF_SpaceTraveler
 
 } NDOF_DeviceT;
 
-// NDOF device button event types
+/* NDOF device button event types */
 typedef enum {
-  // used internally, never sent
+  /* Used internally, never sent. */
   NDOF_BUTTON_NONE,
-  // these two are available from any 3Dconnexion device
+  /* These two are available from any 3Dconnexion device. */
   NDOF_BUTTON_MENU,
   NDOF_BUTTON_FIT,
-  // standard views
+  /* Standard views. */
   NDOF_BUTTON_TOP,
   NDOF_BUTTON_BOTTOM,
   NDOF_BUTTON_LEFT,
   NDOF_BUTTON_RIGHT,
   NDOF_BUTTON_FRONT,
   NDOF_BUTTON_BACK,
-  // more views
+  /* More views. */
   NDOF_BUTTON_ISO1,
   NDOF_BUTTON_ISO2,
-  // 90 degree rotations
-  // these don't all correspond to physical buttons
+  /* 90 degree rotations.
+   * These don't all correspond to physical buttons. */
   NDOF_BUTTON_ROLL_CW,
   NDOF_BUTTON_ROLL_CCW,
   NDOF_BUTTON_SPIN_CW,
   NDOF_BUTTON_SPIN_CCW,
   NDOF_BUTTON_TILT_CW,
   NDOF_BUTTON_TILT_CCW,
-  // device control
+  /* Device control. */
   NDOF_BUTTON_ROTATE,
   NDOF_BUTTON_PANZOOM,
   NDOF_BUTTON_DOMINANT,
   NDOF_BUTTON_PLUS,
   NDOF_BUTTON_MINUS,
-  // keyboard emulation
+  /* Keyboard emulation. */
   NDOF_BUTTON_ESC,
   NDOF_BUTTON_ALT,
   NDOF_BUTTON_SHIFT,
   NDOF_BUTTON_CTRL,
-  // general-purpose buttons
-  // users can assign functions via keymap editor
+  /* General-purpose buttons.
+   * Users can assign functions via keymap editor. */
   NDOF_BUTTON_1,
   NDOF_BUTTON_2,
   NDOF_BUTTON_3,
@@ -92,11 +92,11 @@ typedef enum {
   NDOF_BUTTON_8,
   NDOF_BUTTON_9,
   NDOF_BUTTON_10,
-  // more general-purpose buttons
+  /* More general-purpose buttons. */
   NDOF_BUTTON_A,
   NDOF_BUTTON_B,
   NDOF_BUTTON_C,
-  // the end
+  /* The end. */
   NDOF_BUTTON_LAST
 } NDOF_ButtonT;
 
@@ -107,40 +107,53 @@ class GHOST_NDOFManager {
   {
   }
 
-  // whether multi-axis functionality is available (via the OS or driver)
-  // does not imply that a device is plugged in or being used
+  /**
+   * Whether multi-axis functionality is available (via the OS or driver)
+   * does not imply that a device is plugged in or being used.
+   */
   virtual bool available() = 0;
 
-  // each platform's device detection should call this
-  // use standard USB/HID identifiers
+  /**
+   * Each platform's device detection should call this
+   * use standard USB/HID identifiers.
+   */
   bool setDevice(unsigned short vendor_id, unsigned short product_id);
 
-  // filter out small/accidental/uncalibrated motions by
-  // setting up a "dead zone" around home position
-  // set to 0 to disable
-  // 0.1 is a safe and reasonable value
+  /**
+   * Filter out small/accidental/un-calibrated motions by
+   * setting up a "dead zone" around home position
+   * set to 0 to disable
+   * 0.1 is a safe and reasonable value.
+   */
   void setDeadZone(float);
 
-  // the latest raw axis data from the device
-  // NOTE: axis data should be in blender view coordinates
-  //       +X is to the right
-  //       +Y is up
-  //       +Z is out of the screen
-  //       for rotations, look from origin to each +axis
-  //       rotations are + when CCW, - when CW
-  // each platform is responsible for getting axis data into this form
-  // these values should not be scaled (just shuffled or flipped)
+  /**
+   * The latest raw axis data from the device.
+   *
+   * \note axis data should be in blender view coordinates
+   * - +X is to the right.
+   * - +Y is up.
+   * - +Z is out of the screen.
+   * - for rotations, look from origin to each +axis.
+   * - rotations are + when CCW, - when CW.
+   * Each platform is responsible for getting axis data into this form
+   * these values should not be scaled (just shuffled or flipped).
+   */
   void updateTranslation(const int t[3], uint64_t time);
   void updateRotation(const int r[3], uint64_t time);
 
-  // the latest raw button data from the device
-  // use HID button encoding (not NDOF_ButtonT)
+  /**
+   * The latest raw button data from the device
+   * use HID button encoding (not #NDOF_ButtonT).
+   */
   void updateButton(int button_number, bool press, uint64_t time);
   void updateButtons(int button_bits, uint64_t time);
-  // NDOFButton events are sent immediately
+  /* #NDOFButton events are sent immediately */
 
-  // processes and sends most recent raw data as an NDOFMotion event
-  // returns whether an event was sent
+  /**
+   * Processes and sends most recent raw data as an #NDOFMotion event
+   * returns whether an event was sent.
+   */
   bool sendMotionEvent();
 
  protected:
@@ -157,12 +170,12 @@ class GHOST_NDOFManager {
 
   int m_translation[3];
   int m_rotation[3];
-  int m_buttons;  // bit field
+  int m_buttons; /* Bit field. */
 
-  uint64_t m_motionTime;      // in milliseconds
-  uint64_t m_prevMotionTime;  // time of most recent Motion event sent
+  uint64_t m_motionTime;     /* In milliseconds. */
+  uint64_t m_prevMotionTime; /* Time of most recent motion event sent. */
 
   GHOST_TProgress m_motionState;
   bool m_motionEventPending;
-  float m_deadZone;  // discard motion with each component < this
+  float m_deadZone; /* Discard motion with each component < this. */
 };

intern/ghost/intern/GHOST_Rect.cpp

@@ -26,14 +26,14 @@
 void GHOST_Rect::inset(int32_t i)
 {
   if (i > 0) {
-    // Grow the rectangle
+    /* Grow the rectangle. */
     m_l -= i;
     m_r += i;
     m_t -= i;
     m_b += i;
   }
   else if (i < 0) {
-    // Shrink the rectangle, check for insets larger than half the size
+    /* Shrink the rectangle, check for insets larger than half the size. */
     int32_t i2 = i * 2;
     if (getWidth() > i2) {
       m_l += i;
@@ -62,12 +62,12 @@ GHOST_TVisibility GHOST_Rect::getVisibility(GHOST_Rect &r) const
   bool rb = isInside(r.m_r, r.m_b);
   GHOST_TVisibility v;
   if (lt && rt && lb && rb) {
-    // All points inside, rectangle is inside this
+    /* All points inside, rectangle is inside this. */
     v = GHOST_kFullyVisible;
   }
   else if (!(lt || rt || lb || rb)) {
-    // None of the points inside
-    // Check to see whether the rectangle is larger than this one
+    /* None of the points inside.
+     * Check to see whether the rectangle is larger than this one. */
     if ((r.m_l < m_l) && (r.m_t < m_t) && (r.m_r > m_r) && (r.m_b > m_b)) {
       v = GHOST_kPartiallyVisible;
     }
@@ -76,7 +76,7 @@ GHOST_TVisibility GHOST_Rect::getVisibility(GHOST_Rect &r) const
     }
   }
   else {
-    // Some of the points inside, rectangle is partially inside
+    /* Some of the points inside, rectangle is partially inside. */
     v = GHOST_kPartiallyVisible;
   }
   return v;

intern/ghost/intern/GHOST_System.cpp

@@ -72,7 +72,7 @@ GHOST_ITimerTask *GHOST_System::installTimer(uint64_t delay,
   GHOST_TimerTask *timer = new GHOST_TimerTask(millis + delay, interval, timerProc, userData);
   if (timer) {
     if (m_timerManager->addTimer(timer) == GHOST_kSuccess) {
-      // Check to see whether we need to fire the timer right away
+      /* Check to see whether we need to fire the timer right away. */
       m_timerManager->fireTimers(millis);
     }
     else {
@@ -208,7 +208,7 @@ bool GHOST_System::getFullScreen(void)
 void GHOST_System::dispatchEvents()
 {
 #ifdef WITH_INPUT_NDOF
-  // NDOF Motion event is sent only once per dispatch, so do it now:
+  /* NDOF Motion event is sent only once per dispatch, so do it now: */
   if (m_ndofManager) {
     m_ndofManager->sendMotionEvent();
   }
@@ -260,10 +260,10 @@ GHOST_TSuccess GHOST_System::pushEvent(GHOST_IEvent *event)
 GHOST_TSuccess GHOST_System::getModifierKeyState(GHOST_TModifierKeyMask mask, bool &isDown) const
 {
   GHOST_ModifierKeys keys;
-  // Get the state of all modifier keys
+  /* Get the state of all modifier keys. */
   GHOST_TSuccess success = getModifierKeys(keys);
   if (success) {
-    // Isolate the state of the key requested
+    /* Isolate the state of the key requested. */
     isDown = keys.get(mask);
   }
   return success;
@@ -272,10 +272,10 @@ GHOST_TSuccess GHOST_System::getModifierKeyState(GHOST_TModifierKeyMask mask, bo
 GHOST_TSuccess GHOST_System::getButtonState(GHOST_TButtonMask mask, bool &isDown) const
 {
   GHOST_Buttons buttons;
-  // Get the state of all mouse buttons
+  /* Get the state of all mouse buttons. */
   GHOST_TSuccess success = getButtons(buttons);
   if (success) {
-    // Isolate the state of the mouse button requested
+    /* Isolate the state of the mouse button requested. */
     isDown = buttons.get(mask);
   }
   return success;
@@ -311,7 +311,7 @@ GHOST_TSuccess GHOST_System::init()
     m_eventPrinter = new GHOST_EventPrinter();
     m_eventManager->addConsumer(m_eventPrinter);
   }
-#endif  // WITH_GHOST_DEBUG
+#endif /* WITH_GHOST_DEBUG */
 
   if (m_timerManager && m_windowManager && m_eventManager) {
     return GHOST_kSuccess;
@@ -359,7 +359,7 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window **window,
   if (alphaBackground)
     glSettings.flags |= GHOST_glAlphaBackground;
 
-  /* note: don't use getCurrentDisplaySetting() because on X11 we may
+  /* NOTE: don't use #getCurrentDisplaySetting() because on X11 we may
    * be zoomed in and the desktop may be bigger than the viewport. */
   GHOST_ASSERT(m_displayManager,
                "GHOST_System::createFullScreenWindow(): invalid display manager");

intern/ghost/intern/GHOST_System.h

@@ -113,8 +113,8 @@ class GHOST_System : public GHOST_ISystem {
   GHOST_TSuccess disposeWindow(GHOST_IWindow *window);
 
   /**
-   * Create a new offscreen context.
-   * Never explicitly delete the context, use disposeContext() instead.
+   * Create a new off-screen context.
+   * Never explicitly delete the context, use #disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   virtual GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings) = 0;

intern/ghost/intern/GHOST_SystemCocoa.h

@@ -112,8 +112,8 @@ class GHOST_SystemCocoa : public GHOST_System {
                               const GHOST_IWindow *parentWindow = NULL);
 
   /**
-   * Create a new offscreen context.
-   * Never explicitly delete the context, use disposeContext() instead.
+   * Create a new off-screen context.
+   * Never explicitly delete the context, use #disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings);

intern/ghost/intern/GHOST_SystemCocoa.mm

@@ -761,7 +761,7 @@ GHOST_IWindow *GHOST_SystemCocoa::createWindow(const char *title,
 }
 
 /**
- * Create a new offscreen context.
+ * Create a new off-screen context.
  * Never explicitly delete the context, use #disposeContext() instead.
  * \return The new context (or 0 if creation failed).
  */

intern/ghost/intern/GHOST_SystemSDL.cpp

@@ -143,7 +143,7 @@ GHOST_IContext *GHOST_SystemSDL::createOffscreenContext(GHOST_GLSettings glSetti
 {
   GHOST_Context *context = new GHOST_ContextSDL(0,
                                                 NULL,
-                                                0,  // profile bit
+                                                0, /* Profile bit. */
                                                 3,
                                                 3,
                                                 GHOST_OPENGL_SDL_CONTEXT_FLAGS,
@@ -279,7 +279,7 @@ static GHOST_TKey convertSDLKey(SDL_Scancode key)
       GXMAP(type, SDL_SCANCODE_AUDIOPLAY, GHOST_kKeyMediaPlay);
       GXMAP(type, SDL_SCANCODE_AUDIOSTOP, GHOST_kKeyMediaStop);
       GXMAP(type, SDL_SCANCODE_AUDIOPREV, GHOST_kKeyMediaFirst);
-      // GXMAP(type,XF86XK_AudioRewind,       GHOST_kKeyMediaFirst);
+      // GXMAP(type, XF86XK_AudioRewind, GHOST_kKeyMediaFirst);
       GXMAP(type, SDL_SCANCODE_AUDIONEXT, GHOST_kKeyMediaLast);
 
       default:
@@ -315,7 +315,10 @@ void GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
       SDL_WindowEvent &sdl_sub_evt = sdl_event->window;
       GHOST_WindowSDL *window = findGhostWindow(
           SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
-      // assert(window != NULL); // can be NULL on close window.
+      /* Can be NULL on close window. */
+#if 0
+      assert(window != NULL);
+#endif
 
       switch (sdl_sub_evt.event) {
         case SDL_WINDOWEVENT_EXPOSED:
@@ -376,14 +379,14 @@ void GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
         bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis());
         window->getCursorGrabAccum(x_accum, y_accum);
 
-        // can't use setCursorPosition because the mouse may have no focus!
+        /* Can't use #setCursorPosition because the mouse may have no focus! */
         if (x_new != x_root || y_new != y_root) {
-          if (1) {  //xme.time > m_last_warp) {
+          if (1 /* `xme.time > m_last_warp` */ ) {
             /* when wrapping we don't need to add an event because the
-             * setCursorPosition call will cause a new event after */
+             * #setCursorPosition call will cause a new event after */
             SDL_WarpMouseInWindow(sdl_win, x_new - x_win, y_new - y_win); /* wrap */
             window->setCursorGrabAccum(x_accum + (x_root - x_new), y_accum + (y_root - y_new));
-            // m_last_warp= lastEventTime(xme.time);
+            // m_last_warp = lastEventTime(xme.time);
           }
           else {
             // setCursorPosition(x_new, y_new); /* wrap but don't accumulate */
@@ -659,8 +662,8 @@ bool GHOST_SystemSDL::generateWindowExposeEvents()
 
 bool GHOST_SystemSDL::processEvents(bool waitForEvent)
 {
-  // Get all the current events -- translate them into
-  // ghost events and call base class pushEvent() method.
+  /* Get all the current events - translate them into
+   * ghost events and call base class #pushEvent() method. */
 
   bool anyProcessed = false;
 
@@ -679,7 +682,7 @@ bool GHOST_SystemSDL::processEvents(bool waitForEvent)
 
         if (maxSleep >= 0) {
           SDL_WaitEventTimeout(NULL, next - getMilliSeconds());
-          // SleepTillEvent(m_display, next - getMilliSeconds()); // X11
+          // SleepTillEvent(m_display, next - getMilliSeconds()); /* X11. */
         }
       }
     }
@@ -707,10 +710,10 @@ GHOST_WindowSDL *GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win)
   if (sdl_win == NULL)
     return NULL;
 
-  // It is not entirely safe to do this as the backptr may point
-  // to a window that has recently been removed.
-  // We should always check the window manager's list of windows
-  // and only process events on these windows.
+  /* It is not entirely safe to do this as the backptr may point
+   * to a window that has recently been removed.
+   * We should always check the window manager's list of windows
+   * and only process events on these windows. */
 
   const std::vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows();
 

intern/ghost/intern/GHOST_SystemWin32.cpp

@@ -259,7 +259,7 @@ GHOST_IWindow *GHOST_SystemWin32::createWindow(const char *title,
 }
 
 /**
- * Create a new offscreen context.
+ * Create a new off-screen context.
  * Never explicitly delete the window, use #disposeContext() instead.
  * \return The new context (or 0 if creation failed).
  */
@@ -363,7 +363,7 @@ GHOST_TSuccess GHOST_SystemWin32::disposeContext(GHOST_IContext *context)
 }
 
 /**
- * Create a new offscreen DirectX 11 context.
+ * Create a new off-screen DirectX 11 context.
  * Never explicitly delete the window, use #disposeContext() instead.
  * \return The new context (or 0 if creation failed).
  */

intern/ghost/intern/GHOST_SystemWin32.h

@@ -138,8 +138,8 @@ class GHOST_SystemWin32 : public GHOST_System {
                               const GHOST_IWindow *parentWindow = 0);
 
   /**
-   * Create a new offscreen context.
-   * Never explicitly delete the window, use disposeContext() instead.
+   * Create a new off-screen context.
+   * Never explicitly delete the window, use #disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings);
@@ -152,8 +152,8 @@ class GHOST_SystemWin32 : public GHOST_System {
   GHOST_TSuccess disposeContext(GHOST_IContext *context);
 
   /**
-   * Create a new offscreen DirectX context.
-   * Never explicitly delete the context, use disposeContext() instead.
+   * Create a new off-screen DirectX context.
+   * Never explicitly delete the context, use #disposeContext() instead.
    * This is for GHOST internal, Win32 specific use, so it can be called statically.
    *
    * \return The new context (or 0 if creation failed).
@@ -360,8 +360,8 @@ class GHOST_SystemWin32 : public GHOST_System {
   static GHOST_EventKey *processKeyEvent(GHOST_WindowWin32 *window, RAWINPUT const &raw);
 
   /**
-   * Process special keys (VK_OEM_*), to see if current key layout
-   * gives us anything special, like ! on french AZERTY.
+   * Process special keys `VK_OEM_*`, to see if current key layout
+   * gives us anything special, like `!` on French AZERTY.
    * \param vKey: The virtual key from #hardKey.
    * \param scanCode: The ScanCode of pressed key (similar to PS/2 Set 1).
    */

intern/ghost/intern/GHOST_SystemX11.cpp

@@ -390,21 +390,21 @@ GHOST_IWindow *GHOST_SystemX11::createWindow(const char *title,
 }
 
 /**
- * Create a new offscreen context.
- * Never explicitly delete the context, use disposeContext() instead.
+ * Create a new off-screen context.
+ * Never explicitly delete the context, use #disposeContext() instead.
  * \return The new context (or 0 if creation failed).
  */
 GHOST_IContext *GHOST_SystemX11::createOffscreenContext(GHOST_GLSettings glSettings)
 {
-  // During development:
-  //   try 4.x compatibility profile
-  //   try 3.3 compatibility profile
-  //   fall back to 3.0 if needed
-  //
-  // Final Blender 2.8:
-  //   try 4.x core profile
-  //   try 3.3 core profile
-  //   no fallbacks
+  /* During development:
+   *   try 4.x compatibility profile
+   *   try 3.3 compatibility profile
+   *   fall back to 3.0 if needed
+   *
+   * Final Blender 2.8:
+   *   try 4.x core profile
+   *   try 3.3 core profile
+   *   no fall-backs. */
 
   const bool debug_context = (glSettings.flags & GHOST_glDebugContext) != 0;
 
@@ -2014,7 +2014,7 @@ void GHOST_SystemX11::getClipboard_xcout(const XEvent *evt,
         return;
       }
 
-      // not using INCR mechanism, just read the property
+      /* Not using INCR mechanism, just read the property. */
       XGetWindowProperty(m_display,
                          win,
                          m_atom.XCLIP_OUT,

intern/ghost/intern/GHOST_SystemX11.h

@@ -148,8 +148,8 @@ class GHOST_SystemX11 : public GHOST_System {
                               const GHOST_IWindow *parentWindow = 0);
 
   /**
-   * Create a new offscreen context.
-   * Never explicitly delete the context, use disposeContext() instead.
+   * Create a new off-screen context.
+   * Never explicitly delete the context, use #disposeContext() instead.
    * \return The new context (or 0 if creation failed).
    */
   GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings);

intern/ghost/intern/GHOST_TimerManager.cpp

@@ -55,7 +55,7 @@ GHOST_TSuccess GHOST_TimerManager::addTimer(GHOST_TimerTask *timer)
 {
   GHOST_TSuccess success;
   if (!getTimerFound(timer)) {
-    // Add the timer task
+    /* Add the timer task. */
     m_timers.push_back(timer);
     success = GHOST_kSuccess;
   }
@@ -70,7 +70,7 @@ GHOST_TSuccess GHOST_TimerManager::removeTimer(GHOST_TimerTask *timer)
   GHOST_TSuccess success;
   TTimerVector::iterator iter = std::find(m_timers.begin(), m_timers.end(), timer);
   if (iter != m_timers.end()) {
-    // Remove the timer task
+    /* Remove the timer task. */
     m_timers.erase(iter);
     delete timer;
     success = GHOST_kSuccess;
@@ -113,14 +113,14 @@ bool GHOST_TimerManager::fireTimer(uint64_t time, GHOST_TimerTask *task)
 {
   uint64_t next = task->getNext();
 
-  // Check if the timer should be fired
+  /* Check if the timer should be fired. */
   if (time > next) {
-    // Fire the timer
+    /* Fire the timer. */
     GHOST_TimerProcPtr timerProc = task->getTimerProc();
     uint64_t start = task->getStart();
     timerProc(task, time - start);
 
-    // Update the time at which we will fire it again
+    /* Update the time at which we will fire it again. */
     uint64_t interval = task->getInterval();
     uint64_t numCalls = (next - start) / interval;
     numCalls++;

intern/ghost/intern/GHOST_WindowCocoa.h

@@ -157,7 +157,7 @@ class GHOST_WindowCocoa : public GHOST_Window {
   void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const;
 
   /**
-   * Converts a point in screen coordinates to client rectangle coordinates
+   * Converts a point in client rectangle coordinates to screen coordinates.
    * \param inX: The x-coordinate in the client rectangle.
    * \param inY: The y-coordinate in the client rectangle.
    * \param outX: The x-coordinate on the screen.
@@ -166,7 +166,7 @@ class GHOST_WindowCocoa : public GHOST_Window {
   void clientToScreen(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const;
 
   /**
-   * Converts a point in screen coordinates to client rectangle coordinates
+   * Converts a point in client rectangle coordinates to screen coordinates.
    * but without the y coordinate conversion needed for ghost compatibility.
    * \param inX: The x-coordinate in the client rectangle.
    * \param inY: The y-coordinate in the client rectangle.
@@ -178,10 +178,10 @@ class GHOST_WindowCocoa : public GHOST_Window {
   /**
    * Converts a point in screen coordinates to client rectangle coordinates,
    * but without the y coordinate conversion needed for ghost compatibility.
-   * \param inX: The x-coordinate in the client rectangle.
-   * \param inY: The y-coordinate in the client rectangle.
-   * \param outX: The x-coordinate on the screen.
-   * \param outY: The y-coordinate on the screen.
+   * \param inX: The x-coordinate on the screen.
+   * \param inY: The y-coordinate on the screen.
+   * \param outX: The x-coordinate in the client rectangle.
+   * \param outY: The y-coordinate in the client rectangle.
    */
   void screenToClientIntern(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const;
 

intern/ghost/intern/GHOST_WindowManager.cpp

@@ -45,7 +45,7 @@ GHOST_TSuccess GHOST_WindowManager::addWindow(GHOST_IWindow *window)
   GHOST_TSuccess success = GHOST_kFailure;
   if (window) {
     if (!getWindowFound(window)) {
-      // Store the pointer to the window
+      /* Store the pointer to the window. */
       m_windows.push_back(window);
       success = GHOST_kSuccess;
     }

intern/ghost/intern/GHOST_WindowWayland.cpp

@@ -34,7 +34,7 @@ static constexpr size_t base_dpi = 96;
 struct window_t {
   GHOST_WindowWayland *w;
   wl_surface *surface;
-  // outputs on which the window is currently shown on
+  /* Outputs on which the window is currently shown on. */
   std::unordered_set<const output_t *> outputs;
   uint16_t dpi = 0;
   int scale = 1;
@@ -154,8 +154,8 @@ static bool update_scale(GHOST_WindowWayland *window)
 
   if (scale > 0 && window->scale() != scale) {
     window->scale() = scale;
-    // using the real DPI will cause wrong scaling of the UI
-    // use a multiplier for the default DPI as workaround
+    /* Using the real DPI will cause wrong scaling of the UI
+     * use a multiplier for the default DPI as workaround. */
     window->dpi() = scale * base_dpi;
     wl_surface_set_buffer_scale(window->surface(), scale);
     return true;

intern/ghost/intern/GHOST_WindowWin32.h

@@ -183,7 +183,7 @@ class GHOST_WindowWin32 : public GHOST_Window {
   void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const;
 
   /**
-   * Converts a point in screen coordinates to client rectangle coordinates
+   * Converts a point in client rectangle coordinates to screen coordinates.
    * \param inX: The x-coordinate in the client rectangle.
    * \param inY: The y-coordinate in the client rectangle.
    * \param outX: The x-coordinate on the screen.

intern/ghost/intern/GHOST_XrSession.cpp

@@ -120,7 +120,7 @@ static void create_reference_spaces(OpenXRSessionData &oxr, const GHOST_XrPose &
   XrReferenceSpaceCreateInfo create_info = {XR_TYPE_REFERENCE_SPACE_CREATE_INFO};
   create_info.poseInReferenceSpace.orientation.w = 1.0f;
 
-  create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL;
+  create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_STAGE;
 #if 0
 /* TODO
  *
@@ -144,8 +144,47 @@ static void create_reference_spaces(OpenXRSessionData &oxr, const GHOST_XrPose &
   (void)base_pose;
 #endif
 
-  CHECK_XR(xrCreateReferenceSpace(oxr.session, &create_info, &oxr.reference_space),
-           "Failed to create reference space.");
+  XrResult result = xrCreateReferenceSpace(oxr.session, &create_info, &oxr.reference_space);
+
+  if (XR_FAILED(result)) {
+    /* One of the rare cases where we don't want to immediately throw an exception on failure,
+     * since run-times are not required to support the stage reference space. Although we need the
+     * stage reference space for absolute tracking, if the runtime doesn't support it then just
+     * fallback to the local space. */
+    if (result == XR_ERROR_REFERENCE_SPACE_UNSUPPORTED) {
+      printf(
+          "Warning: XR runtime does not support stage reference space, disabling absolute "
+          "tracking.\n");
+
+      create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL;
+      CHECK_XR(xrCreateReferenceSpace(oxr.session, &create_info, &oxr.reference_space),
+               "Failed to create local reference space.");
+    }
+    else {
+      throw GHOST_XrException("Failed to create stage reference space.", result);
+    }
+  }
+  else {
+    /* Check if tracking bounds are valid. Tracking bounds may be invalid if the user did not
+     * define a tracking space via the XR runtime. */
+    XrExtent2Df extents;
+    CHECK_XR(xrGetReferenceSpaceBoundsRect(oxr.session, XR_REFERENCE_SPACE_TYPE_STAGE, &extents),
+             "Failed to get stage reference space bounds.");
+    if (extents.width == 0.0f || extents.height == 0.0f) {
+      printf(
+          "Warning: Invalid stage reference space bounds, disabling absolute tracking. To enable "
+          "absolute tracking, please define a tracking space via the XR runtime.\n");
+
+      /* Fallback to local space. */
+      if (oxr.reference_space != XR_NULL_HANDLE) {
+        CHECK_XR(xrDestroySpace(oxr.reference_space), "Failed to destroy stage reference space.");
+      }
+
+      create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL;
+      CHECK_XR(xrCreateReferenceSpace(oxr.session, &create_info, &oxr.reference_space),
+               "Failed to create local reference space.");
+    }
+  }
 
   create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_VIEW;
   CHECK_XR(xrCreateReferenceSpace(oxr.session, &create_info, &oxr.view_space),
@@ -370,6 +409,7 @@ void GHOST_XrSession::drawView(GHOST_XrSwapchain &swapchain,
                                XrCompositionLayerProjectionView &r_proj_layer_view,
                                XrSpaceLocation &view_location,
                                XrView &view,
+                               uint32_t view_idx,
                                void *draw_customdata)
 {
   XrSwapchainImageBaseHeader *swapchain_image = swapchain.acquireDrawableSwapchainImage();
@@ -380,6 +420,8 @@ void GHOST_XrSession::drawView(GHOST_XrSwapchain &swapchain,
   r_proj_layer_view.fov = view.fov;
   swapchain.updateCompositionLayerProjectViewSubImage(r_proj_layer_view.subImage);
 
+  assert(view_idx < 256);
+  draw_view_info.view_idx = (char)view_idx;
   draw_view_info.expects_srgb_buffer = swapchain.isBufferSRGB();
   draw_view_info.ofsx = r_proj_layer_view.subImage.imageRect.offset.x;
   draw_view_info.ofsy = r_proj_layer_view.subImage.imageRect.offset.y;
@@ -429,6 +471,7 @@ XrCompositionLayerProjection GHOST_XrSession::drawLayer(
              r_proj_layer_views[view_idx],
              view_location,
              m_oxr->views[view_idx],
+             view_idx,
              draw_customdata);
   }
 

intern/ghost/intern/GHOST_XrSession.h

@@ -117,6 +117,7 @@ class GHOST_XrSession {
                 XrCompositionLayerProjectionView &r_proj_layer_view,
                 XrSpaceLocation &view_location,
                 XrView &view,
+                uint32_t view_idx,
                 void *draw_customdata);
   void beginFrameDrawing();
   void endFrameDrawing(std::vector<XrCompositionLayerBaseHeader *> &layers);

intern/guardedalloc/intern/mallocn.c

@@ -67,7 +67,7 @@ const char *(*MEM_name_ptr)(void *vmemh) = MEM_lockfree_name_ptr;
 
 void *aligned_malloc(size_t size, size_t alignment)
 {
-  /* posix_memalign requires alignment to be a multiple of sizeof(void *). */
+  /* #posix_memalign requires alignment to be a multiple of `sizeof(void *)`. */
   assert(alignment >= ALIGNED_MALLOC_MINIMUM_ALIGNMENT);
 
 #ifdef _WIN32

intern/libmv/CMakeLists.txt

@@ -217,39 +217,39 @@ if(WITH_LIBMV)
   if(WITH_GTESTS)
     include(GTestTesting)
 
-    blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "")
+    blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "")
 
-    BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_array_nd" "./libmv/image/array_nd_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_convolve" "./libmv/image/convolve_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_image" "./libmv/image/image_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_sample" "./libmv/image/sample_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_tuple" "./libmv/image/tuple_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_homography" "./libmv/multiview/homography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_panography" "./libmv/multiview/panography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_projection" "./libmv/multiview/projection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_resection" "./libmv/multiview/resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_numeric" "./libmv/numeric/numeric_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_poly" "./libmv/numeric/poly_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-    BLENDER_SRC_GTEST("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_vector" "./libmv/base/vector_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_array_nd" "./libmv/image/array_nd_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_convolve" "./libmv/image/convolve_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_image" "./libmv/image/image_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_sample" "./libmv/image/sample_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_tuple" "./libmv/image/tuple_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_homography" "./libmv/multiview/homography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_panography" "./libmv/multiview/panography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_projection" "./libmv/multiview/projection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_resection" "./libmv/multiview/resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_numeric" "./libmv/numeric/numeric_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_poly" "./libmv/numeric/poly_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    blender_add_test_executable("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
   endif()
 else()
   list(APPEND SRC

intern/memutil/MEM_Allocator.h

@@ -62,8 +62,8 @@ template<typename _Tp> struct MEM_Allocator {
     return &__x;
   }
 
-  // NB: __n is permitted to be 0.  The C++ standard says nothing
-  // about what the return value is when __n == 0.
+  /* NOTE: `__n` is permitted to be 0.
+   * The C++ standard says nothing about what the return value is when `__n == 0`. */
   _Tp *allocate(size_type __n, const void * = 0)
   {
     _Tp *__ret = NULL;

intern/opensubdiv/CMakeLists.txt

@@ -129,5 +129,5 @@ if(WITH_GTESTS AND WITH_OPENSUBDIV)
   add_definitions(${GLOG_DEFINES})
   add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
 
-  BLENDER_SRC_GTEST(opensubdiv_mesh_topology_test "internal/topology/mesh_topology_test.cc" "${LIB};bf_intern_opensubdiv")
+  blender_add_test_executable(opensubdiv_mesh_topology_test "internal/topology/mesh_topology_test.cc" "${INC}" "${INC_SYS}" "${LIB};bf_intern_opensubdiv")
 endif()

intern/rigidbody/RBI_api.h

@@ -64,7 +64,7 @@ typedef struct rbConstraint rbConstraint;
 /* Setup ---------------------------- */
 
 /* Create a new dynamics world instance */
-// TODO: add args to set the type of constraint solvers, etc.
+/* TODO: add args to set the type of constraint solvers, etc. */
 rbDynamicsWorld *RB_dworld_new(const float gravity[3]);
 
 /* Delete the given dynamics world, and free any extra data it may require */

release/datafiles/userdef/userdef_default.c

@@ -113,7 +113,7 @@ const UserDef U_default = {
     .gp_eraser = 25,
     .gp_settings = 0,
 
-    /** Initialized by: #BKE_studiolight_default . */
+    /** Initialized by: #BKE_studiolight_default. */
     .light_param = {{0}},
     .light_ambient = {0, 0, 0},
 

release/scripts/modules/bl_i18n_utils/utils_cli.py

@@ -71,7 +71,7 @@ def rtl_process_po(args, settings):
     po.write(kind="PO", dest=args.dst)
 
 
-def language_menu(_args, settings):
+def language_menu(args, settings):
     # 'DEFAULT' and en_US are always valid, fully-translated "languages"!
     stats = {"DEFAULT": 1.0, "en_US": 1.0}
 

release/scripts/modules/nodeitems_utils.py

@@ -77,7 +77,7 @@ class NodeItem:
             else:
                 return bpy.app.translations.contexts.default
 
-    # NB: is a staticmethod because called with an explicit self argument
+    # NOTE: is a staticmethod because called with an explicit self argument
     # NodeItemCustom sets this as a variable attribute in __init__
     @staticmethod
     def draw(self, layout, _context):

release/scripts/startup/bl_operators/geometry_nodes.py

@@ -81,7 +81,10 @@ class NewGeometryNodeTreeAssign(Operator):
         return geometry_modifier_poll(context)
 
     def execute(self, context):
-        modifier = context.object.modifiers.active
+        if context.area.type == 'PROPERTIES':
+            modifier = context.modifier
+        else:
+            modifier = context.object.modifiers.active
 
         if not modifier:
             return {'CANCELLED'}

release/scripts/startup/bl_operators/rigidbody.py

@@ -60,17 +60,22 @@ class CopyRigidbodySettings(Operator):
 
     def execute(self, context):
         obj_act = context.object
-        view_layer = context.view_layer
 
-        # deselect all but mesh objects
+        # Deselect all non mesh objects and objects that
+        # already have a rigid body attached.
+        rb_objects = []
         for o in context.selected_objects:
-            if o.type != 'MESH':
+            if o.type != 'MESH' or o.rigid_body is not None:
                 o.select_set(False)
-            elif o.rigid_body is None:
-                # Add rigidbody to object!
-                view_layer.objects.active = o
-                bpy.ops.rigidbody.object_add()
-        view_layer.objects.active = obj_act
+                if o.rigid_body is not None:
+                    rb_objects.append(o)
+
+        bpy.ops.rigidbody.objects_add()
+
+        # Ensure that the rigid body objects
+        # we've de-selected are selected again.
+        for o in rb_objects:
+            o.select_set(True)
 
         objects = context.selected_objects
         if objects:

release/scripts/startup/bl_ui/properties_collection.py

@@ -86,12 +86,15 @@ class COLLECTION_PT_lineart_collection(CollectionButtonsPanel, Panel):
         row = layout.row()
         row.prop(collection, "lineart_usage")
 
-        layout.prop(collection, "lineart_use_intersection_mask")
+        layout.prop(collection, "lineart_use_intersection_mask", text="Collection Mask")
 
-        row = layout.row(align=True, heading="Masks")
-        row.active = collection.lineart_use_intersection_mask
+        col = layout.column(align=True)
+        col.active = collection.lineart_use_intersection_mask
+        row = col.row(align=True, heading="Masks")
         for i in range(8):
-            row.prop(collection, "lineart_intersection_mask", index=i, text=str(i), toggle=True)
+            row.prop(collection, "lineart_intersection_mask", index=i, text=" ", toggle=True)
+            if i == 3:
+                row = col.row(align=True)
 
 
 classes = (

release/scripts/startup/bl_ui/properties_material.py

@@ -291,18 +291,18 @@ class MATERIAL_PT_lineart(MaterialButtonsPanel, Panel):
         mat = context.material
         lineart = mat.lineart
 
-        layout.prop(lineart, "use_material_mask")
+        layout.prop(lineart, "use_material_mask", text="Material Mask")
 
-        row = layout.row(align=True, heading="Masks")
-        row.active = lineart.use_material_mask
+        col = layout.column(align=True)
+        col.active = lineart.use_material_mask
+        row = col.row(align=True, heading="Masks")
         for i in range(8):
-            row.prop(lineart, "use_material_mask_bits", text=str(i), index=i, toggle=True)
+            row.prop(lineart, "use_material_mask_bits", text=" ", index=i, toggle=True)
+            if i == 3:
+                row = col.row(align=True)
 
         row = layout.row(align=True, heading="Custom Occlusion")
-        row.prop(lineart, "use_mat_occlusion", text="")
-        sub = row.row(align=False)
-        sub.active = lineart.use_mat_occlusion
-        sub.prop(lineart, "mat_occlusion", slider=True, text="Levels")
+        row.prop(lineart, "mat_occlusion", text="Levels")
 
 
 classes = (

release/scripts/startup/bl_ui/properties_physics_fluid.py

@@ -734,11 +734,9 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
 
         col = flow.column()
         col.prop(domain, "noise_scale", text="Upres Factor")
-        # TODO (sebbas): Mantaflow only supports wavelet noise. Maybe get rid of noise type field.
-        col.prop(domain, "noise_type", text="Noise Method")
+        col.prop(domain, "noise_strength", text="Strength")
 
         col = flow.column()
-        col.prop(domain, "noise_strength", text="Strength")
         col.prop(domain, "noise_pos_scale", text="Scale")
         col.prop(domain, "noise_time_anim", text="Time")
 

release/scripts/startup/bl_ui/space_sequencer.py

@@ -1156,14 +1156,19 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
             flow.prop(strip, "use_only_boost")
 
         elif strip_type == 'SPEED':
-            layout.prop(strip, "use_default_fade", text="Stretch to Input Strip Length")
-            if not strip.use_default_fade:
-                layout.prop(strip, "use_as_speed")
-                if strip.use_as_speed:
-                    layout.prop(strip, "speed_factor")
-                else:
-                    layout.prop(strip, "speed_factor", text="Frame Number")
-                    layout.prop(strip, "use_scale_to_length")
+            col = layout.column(align=True)
+            col.prop(strip, "speed_control", text="Speed Control")
+            if strip.speed_control == "MULTIPLY":
+                col.prop(strip, "speed_factor", text=" ")
+            elif strip.speed_control == "LENGTH":
+                col.prop(strip, "speed_length", text=" ")
+            elif strip.speed_control == "FRAME_NUMBER":
+                col.prop(strip, "speed_frame_number", text=" ")
+
+            row = layout.row(align=True)
+            row.enabled = strip.speed_control != "STRETCH"
+            row = layout.row(align=True, heading="Interpolation")
+            row.prop(strip, "use_frame_interpolate", text="")
 
         elif strip_type == 'TRANSFORM':
             col = layout.column()
@@ -1233,11 +1238,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
             layout.prop(strip, "wrap_width", text="Wrap Width")
 
         col = layout.column(align=True)
-        if strip_type == 'SPEED':
-            col.prop(strip, "multiply_speed")
-            col.prop(strip, "use_frame_interpolate")
-
-        elif strip_type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}:
+        if strip_type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}:
             col.prop(strip, "use_default_fade", text="Default Fade")
             if not strip.use_default_fade:
                 col.prop(strip, "effect_fader", text="Effect Fader")
@@ -2293,8 +2294,8 @@ class SEQUENCER_PT_snapping(Panel):
         col.prop(sequencer_tool_settings, "snap_ignore_muted", text="Muted Strips")
         col.prop(sequencer_tool_settings, "snap_ignore_sound", text="Sound Strips")
 
-        col = layout.column()
-        col.prop(sequencer_tool_settings, "use_snap_current_frame_to_strips")
+        col = layout.column(heading="Current Frame", align=True)
+        col.prop(sequencer_tool_settings, "use_snap_current_frame_to_strips", text="Snap to Strips")
 
 
 classes = (

release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

@@ -191,6 +191,11 @@ class _defs_annotate:
                 row.prop(tool_settings.gpencil_sculpt, "lockaxis")
             elif tool_settings.gpencil_stroke_placement_view3d in {'SURFACE', 'STROKE'}:
                 row.prop(tool_settings, "use_gpencil_stroke_endpoints")
+        elif space_type in {'IMAGE_EDITOR', 'NODE_EDITOR', 'SEQUENCE_EDITOR', 'CLIP_EDITOR'}:
+            layout.separator()
+
+            row = layout.row(align=True)
+            row.prop(tool_settings, "annotation_stroke_placement_view2d", text="Placement")
 
         if tool.idname == "builtin.annotate_line":
             layout.separator()

release/scripts/startup/nodeitems_builtins.py

@@ -504,13 +504,13 @@ geometry_node_categories = [
         NodeItem("GeometryNodeCurveSubdivide"),
         NodeItem("GeometryNodeCurveToMesh"),
         NodeItem("GeometryNodeCurveResample"),
-        NodeItem("GeometryNodeCurveSample"),
         NodeItem("GeometryNodeMeshToCurve"),
         NodeItem("GeometryNodeCurveToPoints"),
         NodeItem("GeometryNodeCurveEndpoints"),
         NodeItem("GeometryNodeCurveTrim"),
         NodeItem("GeometryNodeCurveLength"),
         NodeItem("GeometryNodeCurveReverse"),
+        NodeItem("GeometryNodeCurveSetHandles"),
     ]),
     GeometryNodeCategory("GEO_PRIMITIVES_CURVE", "Curve Primitives", items=[
         NodeItem("GeometryNodeCurvePrimitiveLine"),

release/scripts/templates_py/custom_nodes.py

@@ -147,7 +147,7 @@ node_categories = [
     MyNodeCategory('OTHERNODES', "Other Nodes", items=[
         # the node item can have additional settings,
         # which are applied to new nodes
-        # NB: settings values are stored as string expressions,
+        # NOTE: settings values are stored as string expressions,
         # for this reason they should be converted to strings using repr()
         NodeItem("CustomNodeType", label="Node A", settings={
             "my_string_prop": repr("Lorem ipsum dolor sit amet"),

source/blender/blenfont/intern/blf_font.c

@@ -66,7 +66,7 @@
 /* Batching buffer for drawing. */
 BatchBLF g_batch;
 
-/* freetype2 handle ONLY for this file!. */
+/* freetype2 handle ONLY for this file! */
 static FT_Library ft_lib;
 static SpinLock ft_lib_mutex;
 static SpinLock blf_glyph_cache_mutex;

source/blender/blenkernel/BKE_DerivedMesh.h

@@ -158,7 +158,7 @@ struct DerivedMesh {
   int (*getNumPolys)(DerivedMesh *dm);
 
   /** Copy a single vert/edge/tessellated face from the derived mesh into
-   * ``*r_{vert/edge/face}``. note that the current implementation
+   * `*r_{vert/edge/face}`. note that the current implementation
    * of this function can be quite slow, iterating over all
    * elements (editmesh)
    */

source/blender/blenkernel/BKE_action.hh

@@ -0,0 +1,35 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+#pragma once
+
+/** \file
+ * \ingroup bke
+ */
+#ifndef __cplusplus
+#  error This is a C++ only header.
+#endif
+
+#include "BLI_function_ref.hh"
+
+struct bAction;
+struct FCurve;
+
+namespace blender::bke {
+
+using FoundFCurveCallback = blender::FunctionRef<void(FCurve *fcurve, const char *bone_name)>;
+void BKE_action_find_fcurves_with_bones(const bAction *action, FoundFCurveCallback callback);
+
+};  // namespace blender::bke

source/blender/blenkernel/BKE_armature.hh

@@ -0,0 +1,48 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+#pragma once
+
+/** \file
+ * \ingroup bke
+ */
+#ifndef __cplusplus
+#  error This is a C++ only header.
+#endif
+
+#include "BKE_armature.h"
+
+#include "BLI_function_ref.hh"
+#include "BLI_set.hh"
+
+namespace blender::bke {
+
+struct SelectedBonesResult {
+  bool all_bones_selected = true;
+  bool no_bones_selected = true;
+};
+
+using SelectedBoneCallback = blender::FunctionRef<void(Bone *bone)>;
+SelectedBonesResult BKE_armature_find_selected_bones(const bArmature *armature,
+                                                     SelectedBoneCallback callback);
+
+using BoneNameSet = blender::Set<std::string>;
+/**
+ * Return a set of names of the selected bones. An empty set means "ignore bone
+ * selection", which either means all bones are selected, or none are.
+ */
+BoneNameSet BKE_armature_find_selected_bone_names(const bArmature *armature);
+
+};  // namespace blender::bke

source/blender/blenkernel/BKE_blender_version.h

@@ -39,7 +39,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 12
+#define BLENDER_FILE_SUBVERSION 13
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file

source/blender/blenkernel/BKE_cloth.h

@@ -39,14 +39,14 @@ struct Scene;
 
 #define DO_INLINE MALWAYS_INLINE
 
-/* goal defines */
+/* Goal defines. */
 #define SOFTGOALSNAP 0.999f
 
 /* This is approximately the smallest number that can be
  * represented by a float, given its precision. */
 #define ALMOST_ZERO FLT_EPSILON
 
-/* Bits to or into the ClothVertex.flags. */
+/* Bits to or into the #ClothVertex.flags. */
 typedef enum eClothVertexFlag {
   CLOTH_VERT_FLAG_PINNED = (1 << 0),
   CLOTH_VERT_FLAG_NOSELFCOLL = (1 << 1), /* vertex NOT used for self collisions */
@@ -150,7 +150,7 @@ typedef struct ClothSpring {
   float target[3];
 } ClothSpring;
 
-// some macro enhancements for vector treatment
+/* Some macro enhancements for vector treatment. */
 #define VECSUBADDSS(v1, v2, aS, v3, bS) \
   { \
     *(v1) -= *(v2)*aS + *(v3)*bS; \
@@ -211,9 +211,8 @@ typedef enum {
   CLOTH_SPRING_FLAG_NEEDED = (1 << 2), /* Springs has values to be applied. */
 } CLOTH_SPRINGS_FLAGS;
 
-/////////////////////////////////////////////////
-// collision.c
-////////////////////////////////////////////////
+/* -------------------------------------------------------------------- */
+/* collision.c */
 
 struct CollPair;
 
@@ -225,20 +224,17 @@ typedef struct ColliderContacts {
   int totcollisions;
 } ColliderContacts;
 
-// needed for implicit.c
+/* needed for implicit.c */
 int cloth_bvh_collision(struct Depsgraph *depsgraph,
                         struct Object *ob,
                         struct ClothModifierData *clmd,
                         float step,
                         float dt);
 
-////////////////////////////////////////////////
+/* -------------------------------------------------------------------- */
+/* cloth.c */
 
-/////////////////////////////////////////////////
-// cloth.c
-////////////////////////////////////////////////
-
-// needed for modifier.c
+/* Needed for modifier.c */
 void cloth_free_modifier_extern(struct ClothModifierData *clmd);
 void cloth_free_modifier(struct ClothModifierData *clmd);
 void clothModifier_do(struct ClothModifierData *clmd,
@@ -250,18 +246,16 @@ void clothModifier_do(struct ClothModifierData *clmd,
 
 int cloth_uses_vgroup(struct ClothModifierData *clmd);
 
-// needed for collision.c
+/* Needed for collision.c */
 void bvhtree_update_from_cloth(struct ClothModifierData *clmd, bool moving, bool self);
 
-// needed for button_object.c
+/* Needed for button_object.c */
 void cloth_clear_cache(struct Object *ob, struct ClothModifierData *clmd, float framenr);
 
 void cloth_parallel_transport_hair_frame(float mat[3][3],
                                          const float dir_old[3],
                                          const float dir_new[3]);
 
-////////////////////////////////////////////////
-
 #ifdef __cplusplus
 }
 #endif

source/blender/blenkernel/BKE_customdata.h

@@ -501,7 +501,7 @@ enum {
   CD_FAKE = 1 << 8,
 
   /* Vertices. */
-  CD_FAKE_MDEFORMVERT = CD_FAKE | CD_MDEFORMVERT, /* *sigh* due to how vgroups are stored :( . */
+  CD_FAKE_MDEFORMVERT = CD_FAKE | CD_MDEFORMVERT, /* *sigh* due to how vgroups are stored :(. */
   CD_FAKE_SHAPEKEY = CD_FAKE |
                      CD_SHAPEKEY, /* Not available as real CD layer in non-bmesh context. */
 

source/blender/blenkernel/BKE_layer.h

@@ -98,6 +98,9 @@ struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *view_l
                                                         const int index);
 int BKE_layer_collection_findindex(struct ViewLayer *view_layer, const struct LayerCollection *lc);
 
+void BKE_layer_collection_resync_forbid(void);
+void BKE_layer_collection_resync_allow(void);
+
 void BKE_main_collection_sync(const struct Main *bmain);
 void BKE_scene_collection_sync(const struct Scene *scene);
 void BKE_layer_collection_sync(const struct Scene *scene, struct ViewLayer *view_layer);

source/blender/blenkernel/BKE_main.h

@@ -48,6 +48,7 @@ struct BLI_mempool;
 struct BlendThumbnail;
 struct GHash;
 struct GSet;
+struct IDNameLib_Map;
 struct ImBuf;
 struct Library;
 struct MainLock;
@@ -191,6 +192,9 @@ typedef struct Main {
    */
   struct MainIDRelations *relations;
 
+  /* IDMap of IDs. Currently used when reading (expanding) libraries. */
+  struct IDNameLib_Map *id_map;
+
   struct MainLock *lock;
 } Main;
 

source/blender/blenkernel/BKE_main_idmap.h

@@ -50,8 +50,13 @@ struct IDNameLib_Map *BKE_main_idmap_create(struct Main *bmain,
                                             const int idmap_types) ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL(1);
 void BKE_main_idmap_destroy(struct IDNameLib_Map *id_map) ATTR_NONNULL();
+
+void BKE_main_idmap_insert_id(struct IDNameLib_Map *id_map, struct ID *id) ATTR_NONNULL();
+void BKE_main_idmap_remove_id(struct IDNameLib_Map *id_map, struct ID *id) ATTR_NONNULL();
+
 struct Main *BKE_main_idmap_main_get(struct IDNameLib_Map *id_map) ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL();
+
 struct ID *BKE_main_idmap_lookup_name(struct IDNameLib_Map *id_map,
                                       short id_type,
                                       const char *name,

source/blender/blenkernel/BKE_mesh.h

@@ -399,6 +399,12 @@ void BKE_lnor_spacearr_init(MLoopNorSpaceArray *lnors_spacearr,
                             const char data_type);
 void BKE_lnor_spacearr_clear(MLoopNorSpaceArray *lnors_spacearr);
 void BKE_lnor_spacearr_free(MLoopNorSpaceArray *lnors_spacearr);
+
+void BKE_lnor_spacearr_tls_init(MLoopNorSpaceArray *lnors_spacearr,
+                                MLoopNorSpaceArray *lnors_spacearr_tls);
+void BKE_lnor_spacearr_tls_join(MLoopNorSpaceArray *lnors_spacearr,
+                                MLoopNorSpaceArray *lnors_spacearr_tls);
+
 MLoopNorSpace *BKE_lnor_space_create(MLoopNorSpaceArray *lnors_spacearr);
 void BKE_lnor_space_define(MLoopNorSpace *lnor_space,
                            const float lnor[3],

source/blender/blenkernel/BKE_mesh_iterators.h

@@ -41,6 +41,7 @@ void BKE_mesh_foreach_mapped_vert(struct Mesh *mesh,
                                   MeshForeachFlag flag);
 void BKE_mesh_foreach_mapped_edge(
     struct Mesh *mesh,
+    int tot_edges,
     void (*func)(void *userData, int index, const float v0co[3], const float v1co[3]),
     void *userData);
 void BKE_mesh_foreach_mapped_loop(struct Mesh *mesh,

source/blender/blenkernel/BKE_node.h

@@ -1465,7 +1465,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
 #define GEO_NODE_CURVE_ENDPOINTS 1069
 #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
 #define GEO_NODE_CURVE_TRIM 1071
-#define GEO_NODE_CURVE_SAMPLE 1072
+#define GEO_NODE_CURVE_SET_HANDLES 1072
 
 /** \} */
 

source/blender/blenkernel/BKE_spline.hh

@@ -56,8 +56,6 @@ using SplinePtr = std::unique_ptr<Spline>;
  *     along the length of a curve.
  *  3. #sample_uniform_index_factors returns an array that stores uniform-length samples
  *     along the spline which can be used to interpolate data from method 1.
- *  4. #sample_lengths_to_index_factors does the same, but uses arbitrary parameter
- *     inputs, instead of sampling uniformly.
  *
  * Commonly used evaluated data is stored in caches on the spline itself so that operations on
  * splines don't need to worry about taking ownership of evaluated data when they don't need to.
@@ -172,16 +170,11 @@ class Spline {
   LookupResult lookup_evaluated_length(const float length) const;
 
   blender::Array<float> sample_uniform_index_factors(const int samples_size) const;
-  blender::Array<float> sample_lengths_to_index_factors(blender::Span<float> parameters) const;
-
   LookupResult lookup_data_from_index_factor(const float index_factor) const;
 
   void sample_with_index_factors(const blender::fn::GVArray &src,
                                  blender::Span<float> index_factors,
                                  blender::fn::GMutableSpan dst) const;
-  void sample_with_index_factors(blender::fn::GSpan src,
-                                 blender::Span<float> index_factors,
-                                 blender::fn::GMutableSpan dst) const;
   template<typename T>
   void sample_with_index_factors(const blender::VArray<T> &src,
                                  blender::Span<float> index_factors,
@@ -313,6 +306,7 @@ class BezierSpline final : public Spline {
   blender::MutableSpan<HandleType> handle_types_right();
   blender::Span<blender::float3> handle_positions_right() const;
   blender::MutableSpan<blender::float3> handle_positions_right();
+  void ensure_auto_handles() const;
 
   void translate(const blender::float3 &translation) override;
   void transform(const blender::float4x4 &matrix) override;
@@ -360,8 +354,6 @@ class BezierSpline final : public Spline {
   void correct_end_tangents() const final;
   void copy_settings(Spline &dst) const final;
   void copy_data(Spline &dst) const final;
-
-  void ensure_auto_handles() const;
 };
 
 /**
@@ -551,6 +543,7 @@ struct CurveEval {
 
   blender::Span<SplinePtr> splines() const;
   blender::MutableSpan<SplinePtr> splines();
+  bool has_spline_with_type(const Spline::Type type) const;
 
   void resize(const int size);
   void add_spline(SplinePtr spline);

source/blender/blenkernel/CMakeLists.txt

@@ -69,6 +69,7 @@ set(SRC
   intern/CCGSubSurf_util.c
   intern/DerivedMesh.cc
   intern/action.c
+  intern/action_bones.cc
   intern/action_mirror.c
   intern/addon.c
   intern/anim_data.c
@@ -77,6 +78,7 @@ set(SRC
   intern/anim_visualization.c
   intern/appdir.c
   intern/armature.c
+  intern/armature_selection.cc
   intern/armature_deform.c
   intern/armature_pose.cc
   intern/armature_update.c
@@ -287,6 +289,7 @@ set(SRC
 
   BKE_DerivedMesh.h
   BKE_action.h
+  BKE_action.hh
   BKE_addon.h
   BKE_anim_data.h
   BKE_anim_path.h
@@ -294,6 +297,7 @@ set(SRC
   BKE_animsys.h
   BKE_appdir.h
   BKE_armature.h
+  BKE_armature.hh
   BKE_asset.h
   BKE_attribute.h
   BKE_attribute_access.hh

source/blender/blenkernel/intern/action_bones.cc

@@ -0,0 +1,48 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ */
+
+/** \file
+ * \ingroup bke
+ */
+
+#include "BKE_action.hh"
+
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
+#include "DNA_action_types.h"
+#include "DNA_anim_types.h"
+
+#include "MEM_guardedalloc.h"
+
+namespace blender::bke {
+
+void BKE_action_find_fcurves_with_bones(const bAction *action, FoundFCurveCallback callback)
+{
+  LISTBASE_FOREACH (FCurve *, fcu, &action->curves) {
+    char *bone_name = BLI_str_quoted_substrN(fcu->rna_path, "pose.bones[");
+    if (!bone_name) {
+      continue;
+    }
+    callback(fcu, bone_name);
+    MEM_freeN(bone_name);
+  }
+}
+
+}  // namespace blender::bke

source/blender/blenkernel/intern/anim_sys.c

@@ -1947,7 +1947,7 @@ static void nlaevalchan_blendOrcombine(NlaEvalChannelSnapshot *lower_necs,
           return;
         }
         default:
-          BLI_assert("Mix mode should've been handled");
+          BLI_assert_msg(0, "Mix mode should've been handled");
       }
       return;
     }
@@ -1960,7 +1960,7 @@ static void nlaevalchan_blendOrcombine(NlaEvalChannelSnapshot *lower_necs,
       return;
     }
     default:
-      BLI_assert("Blend mode should've been handled");
+      BLI_assert_msg(0, "Blend mode should've been handled");
   }
 }
 
@@ -2110,7 +2110,7 @@ static void nlaevalchan_blendOrcombine_get_inverted_upper_evalchan(
           return;
         }
         default:
-          BLI_assert("Mix mode should've been handled");
+          BLI_assert_msg(0, "Mix mode should've been handled");
       }
       return;
     }
@@ -2123,7 +2123,7 @@ static void nlaevalchan_blendOrcombine_get_inverted_upper_evalchan(
       return;
     }
     default:
-      BLI_assert("Blend mode should've been handled");
+      BLI_assert_msg(0, "Blend mode should've been handled");
   }
 }
 

source/blender/blenkernel/intern/armature_pose.cc

@@ -23,8 +23,9 @@
  * \ingroup bke
  */
 
+#include "BKE_action.hh"
 #include "BKE_animsys.h"
-#include "BKE_armature.h"
+#include "BKE_armature.hh"
 
 #include "BLI_function_ref.hh"
 #include "BLI_set.hh"
@@ -36,14 +37,14 @@
 
 #include "RNA_access.h"
 
+using namespace blender::bke;
+
 namespace {
-using BoneNameSet = blender::Set<std::string>;
 
 using ActionApplier =
     blender::FunctionRef<void(PointerRNA *, bAction *, const AnimationEvalContext *)>;
 
-// Forward declarations.
-BoneNameSet pose_apply_find_selected_bones(const bArmature *armature, const bPose *pose);
+/* Forward declarations. */
 void pose_apply_disable_fcurves_for_unselected_bones(bAction *action,
                                                      const BoneNameSet &selected_bone_names);
 void pose_apply_restore_fcurves(bAction *action);
@@ -102,7 +103,7 @@ void pose_apply(struct Object *ob,
   }
 
   const bArmature *armature = (bArmature *)ob->data;
-  const BoneNameSet selected_bone_names = pose_apply_find_selected_bones(armature, pose);
+  const BoneNameSet selected_bone_names = BKE_armature_find_selected_bone_names(armature);
   const bool limit_to_selected_bones = !selected_bone_names.is_empty();
 
   if (limit_to_selected_bones) {
@@ -122,30 +123,6 @@ void pose_apply(struct Object *ob,
   }
 }
 
-BoneNameSet pose_apply_find_selected_bones(const bArmature *armature, const bPose *pose)
-{
-  BoneNameSet selected_bone_names;
-  bool all_bones_selected = true;
-  bool no_bones_selected = true;
-
-  LISTBASE_FOREACH (bPoseChannel *, pchan, &pose->chanbase) {
-    const bool is_selected = PBONE_SELECTED(armature, pchan->bone);
-    all_bones_selected &= is_selected;
-    no_bones_selected &= !is_selected;
-
-    if (is_selected) {
-      /* Bone names are unique, so no need to check for duplicates. */
-      selected_bone_names.add_new(pchan->name);
-    }
-  }
-
-  /* If no bones are selected, act as if all are. */
-  if (all_bones_selected || no_bones_selected) {
-    return BoneNameSet(); /* An empty set means "ignore bone selection". */
-  }
-  return selected_bone_names;
-}
-
 void pose_apply_restore_fcurves(bAction *action)
 {
   /* TODO(Sybren): Restore the FCurve flags, instead of just erasing the 'disabled' flag. */
@@ -157,24 +134,13 @@ void pose_apply_restore_fcurves(bAction *action)
 void pose_apply_disable_fcurves_for_unselected_bones(bAction *action,
                                                      const BoneNameSet &selected_bone_names)
 {
-  LISTBASE_FOREACH (FCurve *, fcu, &action->curves) {
-    if (!fcu->rna_path || !strstr(fcu->rna_path, "pose.bones[")) {
-      continue;
+  auto disable_unselected_fcurve = [&](FCurve *fcu, const char *bone_name) {
+    const bool is_bone_selected = selected_bone_names.contains(bone_name);
+    if (!is_bone_selected) {
+      fcu->flag |= FCURVE_DISABLED;
     }
-
-    /* Get bone name, and check if this bone is selected. */
-    char *bone_name = BLI_str_quoted_substrN(fcu->rna_path, "pose.bones[");
-    if (!bone_name) {
-      continue;
-    }
-    const bool is_selected = selected_bone_names.contains(bone_name);
-    MEM_freeN(bone_name);
-    if (is_selected) {
-      continue;
-    }
-
-    fcu->flag |= FCURVE_DISABLED;
-  }
+  };
+  BKE_action_find_fcurves_with_bones(action, disable_unselected_fcurve);
 }
 
 }  // namespace

source/blender/blenkernel/intern/armature_selection.cc

@@ -0,0 +1,78 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/** \file
+ * \ingroup bke
+ */
+
+#include "BKE_armature.hh"
+
+#include "BLI_listbase.h"
+
+#include "DNA_action_types.h"
+#include "DNA_armature_types.h"
+
+namespace blender::bke {
+
+namespace {
+
+void find_selected_bones__visit_bone(const bArmature *armature,
+                                     SelectedBoneCallback callback,
+                                     SelectedBonesResult &result,
+                                     Bone *bone)
+{
+  const bool is_selected = PBONE_SELECTED(armature, bone);
+  result.all_bones_selected &= is_selected;
+  result.no_bones_selected &= !is_selected;
+
+  if (is_selected) {
+    callback(bone);
+  }
+
+  LISTBASE_FOREACH (Bone *, child_bone, &bone->childbase) {
+    find_selected_bones__visit_bone(armature, callback, result, child_bone);
+  }
+}
+}  // namespace
+
+SelectedBonesResult BKE_armature_find_selected_bones(const bArmature *armature,
+                                                     SelectedBoneCallback callback)
+{
+  SelectedBonesResult result;
+  LISTBASE_FOREACH (Bone *, root_bone, &armature->bonebase) {
+    find_selected_bones__visit_bone(armature, callback, result, root_bone);
+  }
+
+  return result;
+}
+
+BoneNameSet BKE_armature_find_selected_bone_names(const bArmature *armature)
+{
+  BoneNameSet selected_bone_names;
+
+  /* Iterate over the selected bones to fill the set of bone names. */
+  auto callback = [&](Bone *bone) { selected_bone_names.add(bone->name); };
+  SelectedBonesResult result = BKE_armature_find_selected_bones(armature, callback);
+
+  /* If no bones are selected, act as if all are. */
+  if (result.all_bones_selected || result.no_bones_selected) {
+    return BoneNameSet();
+  }
+
+  return selected_bone_names;
+}
+
+}  // namespace blender::bke

source/blender/blenkernel/intern/armature_test.cc

@@ -17,10 +17,13 @@
  * All rights reserved.
  */
 
-#include "BKE_armature.h"
+#include "BKE_armature.hh"
 
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 
+#include "DNA_armature_types.h"
+
 #include "testing/testing.h"
 
 namespace blender::bke::tests {
@@ -157,4 +160,80 @@ TEST(vec_roll_to_mat3_normalized, Rotationmatrix)
   }
 }
 
+class BKE_armature_find_selected_bones_test : public testing::Test {
+ protected:
+  bArmature arm;
+  Bone bone1, bone2, bone3;
+
+  void SetUp() override
+  {
+    strcpy(bone1.name, "bone1");
+    strcpy(bone2.name, "bone2");
+    strcpy(bone3.name, "bone3");
+
+    arm.bonebase = {nullptr, nullptr};
+    bone1.childbase = {nullptr, nullptr};
+    bone2.childbase = {nullptr, nullptr};
+    bone3.childbase = {nullptr, nullptr};
+
+    BLI_addtail(&arm.bonebase, &bone1);     // bone1 is root bone
+    BLI_addtail(&arm.bonebase, &bone2);     // bone2 is root bone
+    BLI_addtail(&bone2.childbase, &bone3);  // bone3 has bone2 as parent
+
+    // Make sure the armature & its bones are visible, to make them selectable.
+    arm.layer = bone1.layer = bone2.layer = bone3.layer = 1;
+  }
+};
+
+TEST_F(BKE_armature_find_selected_bones_test, some_bones_selected)
+{
+  bone1.flag = BONE_SELECTED;
+  bone2.flag = 0;
+  bone3.flag = BONE_SELECTED;
+
+  std::vector<Bone *> seen_bones;
+  auto callback = [&](Bone *bone) { seen_bones.push_back(bone); };
+
+  SelectedBonesResult result = BKE_armature_find_selected_bones(&arm, callback);
+
+  ASSERT_EQ(seen_bones.size(), 2) << "Expected 2 selected bones, got " << seen_bones.size();
+  EXPECT_EQ(seen_bones[0], &bone1);
+  EXPECT_EQ(seen_bones[1], &bone3);
+
+  EXPECT_FALSE(result.all_bones_selected);  // Bone 2 was not selected.
+  EXPECT_FALSE(result.no_bones_selected);   // Bones 1 and 3 were selected.
+}
+
+TEST_F(BKE_armature_find_selected_bones_test, no_bones_selected)
+{
+  bone1.flag = bone2.flag = bone3.flag = 0;
+
+  std::vector<Bone *> seen_bones;
+  auto callback = [&](Bone *bone) { seen_bones.push_back(bone); };
+
+  SelectedBonesResult result = BKE_armature_find_selected_bones(&arm, callback);
+
+  EXPECT_TRUE(seen_bones.empty()) << "Expected no selected bones, got " << seen_bones.size();
+  EXPECT_FALSE(result.all_bones_selected);
+  EXPECT_TRUE(result.no_bones_selected);
+}
+
+TEST_F(BKE_armature_find_selected_bones_test, all_bones_selected)
+{
+  bone1.flag = bone2.flag = bone3.flag = BONE_SELECTED;
+
+  std::vector<Bone *> seen_bones;
+  auto callback = [&](Bone *bone) { seen_bones.push_back(bone); };
+
+  SelectedBonesResult result = BKE_armature_find_selected_bones(&arm, callback);
+
+  ASSERT_EQ(seen_bones.size(), 3) << "Expected 3 selected bones, got " << seen_bones.size();
+  EXPECT_EQ(seen_bones[0], &bone1);
+  EXPECT_EQ(seen_bones[1], &bone2);
+  EXPECT_EQ(seen_bones[2], &bone3);
+
+  EXPECT_TRUE(result.all_bones_selected);
+  EXPECT_FALSE(result.no_bones_selected);
+}
+
 }  // namespace blender::bke::tests