Merge remote-tracking branch 'b/main'

Author: youle31

.clang-format

@@ -258,7 +258,6 @@ ForEachMacros:
   - SEQ_ALL_BEGIN
   - SEQ_ITERATOR_FOREACH
   - SURFACE_QUAD_ITER_BEGIN
-  - foreach
   - ED_screen_areas_iter
   - SLOT_PROBING_BEGIN
   - SET_SLOT_PROBING_BEGIN

build_files/cmake/packaging.cmake

@@ -107,7 +107,7 @@ if(WIN32)
 
   set(CPACK_WIX_TEMPLATE ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX.template)
   set(CPACK_WIX_UI_BANNER ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_BANNER.bmp)
-  set(CPACK_WIX_UI_DIALOG ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_DIALOG.bmp)
+  set(CPACK_WIX_UI_DIALOG ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_DIALOG.png)
   set(CPACK_WIX_EXTRA_SOURCES ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WixUI_Blender.wxs)
   set(CPACK_WIX_UI_REF "WixUI_Blender")
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)

doc/python_api/examples/bpy.props.1.py

@@ -7,6 +7,7 @@
 button in the 3D View-port's Tools panel. The latter will show the properties
 in the Redo panel and allow you to change them.
 """
+
 import bpy
 
 
@@ -21,7 +22,7 @@ class OBJECT_OT_property_example(bpy.types.Operator):
 
     def execute(self, context):
         self.report(
-            {'INFO'}, "F: {:.2f}  B: {:s}  S: {!r}".format(
+            {'INFO'}, "F: {:.2f}  B: {!s}  S: {!r}".format(
                 self.my_float, self.my_bool, self.my_string,
             )
         )

intern/cycles/scene/osl.cpp

@@ -1549,7 +1549,8 @@ void OSLManager::reset(Scene * /*scene*/) {}
 void OSLManager::device_update_pre(Device * /*device*/, Scene * /*scene*/) {}
 void OSLManager::device_update_post(Device * /*device*/,
                                     Scene * /*scene*/,
-                                    Progress & /*progress*/)
+                                    Progress & /*progress*/,
+                                    const bool /*reload_kernels*/)
 {
 }
 void OSLManager::device_free(Device * /*device*/, DeviceScene * /*dscene*/, Scene * /*scene*/) {}

intern/cycles/scene/volume.cpp

@@ -606,7 +606,7 @@ static void merge_scalar_grids_for_velocity(const Scene *scene, Volume *volume)
   vecgrid->tree().topologyUnion(vel_z_grid->tree());
 
   MergeScalarGrids op(&vel_x_grid->tree(), &vel_y_grid->tree(), &vel_z_grid->tree());
-  openvdb::tools::foreach (vecgrid->beginValueOn(), op, true, false);
+  openvdb::tools::foreach(vecgrid->beginValueOn(), op, true, false);
 
   /* Assume all grids have the same transformation. */
   const openvdb::math::Transform::Ptr transform = openvdb::ConstPtrCast<openvdb::math::Transform>(

intern/ghost/GHOST_Types.h

@@ -371,6 +371,7 @@ typedef enum {
   GHOST_kStandardCursorHandOpen,
   GHOST_kStandardCursorHandClosed,
   GHOST_kStandardCursorHandPoint,
+  GHOST_kStandardCursorBlade,
   GHOST_kStandardCursorCustom,
 
 #define GHOST_kStandardCursorNumCursors (int(GHOST_kStandardCursorCustom) + 1)

intern/ghost/intern/GHOST_SystemWayland.cc

@@ -2309,6 +2309,7 @@ static const GWL_Cursor_ShapeInfo ghost_wl_cursors = []() -> GWL_Cursor_ShapeInf
     CASE_CURSOR(GHOST_kStandardCursorLeftHandle, "");
     CASE_CURSOR(GHOST_kStandardCursorRightHandle, "");
     CASE_CURSOR(GHOST_kStandardCursorBothHandles, "");
+    CASE_CURSOR(GHOST_kStandardCursorBlade, "");
     CASE_CURSOR(GHOST_kStandardCursorCustom, "");
   }
 #undef CASE_CURSOR

intern/opencolorio/ocio_impl.cc

@@ -126,7 +126,7 @@ OCIO_ConstConfigRcPtr *OCIOImpl::configCreateFromFile(const char *filename)
 
 void OCIOImpl::configRelease(OCIO_ConstConfigRcPtr *config)
 {
-  MEM_delete((ConstConfigRcPtr *)config);
+  MEM_delete(reinterpret_cast<ConstConfigRcPtr *>(config));
 }
 
 int OCIOImpl::configGetNumColorSpaces(OCIO_ConstConfigRcPtr *config)
@@ -417,7 +417,7 @@ const char *OCIOImpl::lookGetProcessSpace(OCIO_ConstLookRcPtr *look)
 
 void OCIOImpl::lookRelease(OCIO_ConstLookRcPtr *look)
 {
-  MEM_delete((ConstLookRcPtr *)look);
+  MEM_delete(reinterpret_cast<ConstLookRcPtr *>(look));
 }
 
 int OCIOImpl::colorSpaceIsInvertible(OCIO_ConstColorSpaceRcPtr *cs_)
@@ -536,7 +536,7 @@ void OCIOImpl::colorSpaceIsBuiltin(OCIO_ConstConfigRcPtr *config_,
 
 void OCIOImpl::colorSpaceRelease(OCIO_ConstColorSpaceRcPtr *cs)
 {
-  MEM_delete((ConstColorSpaceRcPtr *)cs);
+  MEM_delete(reinterpret_cast<ConstColorSpaceRcPtr *>(cs));
 }
 
 OCIO_ConstProcessorRcPtr *OCIOImpl::configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config,
@@ -563,7 +563,7 @@ OCIO_ConstProcessorRcPtr *OCIOImpl::configGetProcessorWithNames(OCIO_ConstConfig
 
 void OCIOImpl::processorRelease(OCIO_ConstProcessorRcPtr *processor)
 {
-  MEM_delete(processor);
+  MEM_delete(reinterpret_cast<ConstProcessorRcPtr *>(processor));
 }
 
 OCIO_ConstCPUProcessorRcPtr *OCIOImpl::processorGetCPUProcessor(
@@ -671,7 +671,7 @@ void OCIOImpl::cpuProcessorApplyRGBA_predivide(OCIO_ConstCPUProcessorRcPtr *cpu_
 
 void OCIOImpl::cpuProcessorRelease(OCIO_ConstCPUProcessorRcPtr *cpu_processor)
 {
-  MEM_delete(cpu_processor);
+  MEM_delete(reinterpret_cast<ConstCPUProcessorRcPtr *>(cpu_processor));
 }
 
 const char *OCIOImpl::colorSpaceGetName(OCIO_ConstColorSpaceRcPtr *cs)
@@ -841,7 +841,7 @@ OCIO_PackedImageDesc *OCIOImpl::createOCIO_PackedImageDesc(float *data,
 
 void OCIOImpl::OCIO_PackedImageDescRelease(OCIO_PackedImageDesc *id)
 {
-  MEM_delete((PackedImageDesc *)id);
+  MEM_delete(reinterpret_cast<PackedImageDesc *>(id));
 }
 
 const char *OCIOImpl::getVersionString()