1397 changed files with 5384 additions and 6950 deletions
--- a/6
+++ b/6
@ -535,7 +535,7 @@ check_spelling_shaders: .FORCE
 	    "$(BLENDER_DIR)/source/"

 check_descriptions: .FORCE
-	@$(BLENDER_BIN) --background -noaudio --factory-startup --python \
+	@$(BLENDER_BIN) --background --factory-startup --python \
 	    "$(BLENDER_DIR)/tools/check_source/check_descriptions.py"

 check_deprecated: .FORCE
@ -598,7 +598,7 @@ format: .FORCE
 doc_py: .FORCE
 	@ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
 	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
+	    --background --factory-startup \
 	    --python doc/python_api/sphinx_doc_gen.py
 	@sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
@ -609,7 +609,7 @@ doc_doxy: .FORCE

 doc_dna: .FORCE
 	@$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
+	    --background --factory-startup \
 	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"

--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@ -43,6 +43,10 @@ set(OSL_EXTRA_ARGS
  -DPython_EXECUTABLE=${PYTHON_BINARY}
 )

+if(NOT APPLE)
+  list(APPEND OSL_EXTRA_ARGS -DOSL_USE_OPTIX=ON)
+endif()
+
 ExternalProject_Add(external_osl
  URL file://${PACKAGE_DIR}/${OSL_FILE}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
--- a/build_files/windows/doc_py.cmd
+++ b/build_files/windows/doc_py.cmd
@ -26,7 +26,7 @@ exit /b 1
 :detect_blender_done

 %BLENDER_BIN% ^
-	--background -noaudio --factory-startup ^
+	--background --factory-startup ^
 	--python %BLENDER_DIR%/doc/python_api/sphinx_doc_gen.py

 "%SPHINX_BIN%" -b html %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%
--- a/doc/blender_file_format/BlendFileDnaExporter_25.py
+++ b/doc/blender_file_format/BlendFileDnaExporter_25.py
@ -363,15 +363,15 @@ class DNACatalogHTML:


 def usage():
-    print("\nUsage: \n\tblender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]")
+    print("\nUsage: \n\tblender2.5 --background --python BlendFileDnaExporter_25.py [-- [options]]")
    print("Options:")
    print("\t--dna-keep-blend:      doesn't delete the produced blend file DNA export to html")
    print("\t--dna-debug:           sets the logging level to DEBUG (lots of additional info)")
    print("\t--dna-versioned        saves version information in the html and blend filenames")
    print("\t--dna-overwrite-css    overwrite dna.css, useful when modifying css in the script")
    print("Examples:")
-    print("\tdefault:       % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py")
-    print("\twith options:  % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")
+    print("\tdefault:       % blender2.5 --background --python BlendFileDnaExporter_25.py")
+    print("\twith options:  % blender2.5 --background --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")


 ######################################################
--- a/doc/blender_file_format/README
+++ b/doc/blender_file_format/README
@ -16,14 +16,14 @@ Below you have the help message with a list of options you can use.


 Usage:
-        blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]
+        blender2.5 --background --python BlendFileDnaExporter_25.py [-- [options]]
 Options:
        --dna-keep-blend:      doesn't delete the produced blend file DNA export to html
        --dna-debug:           sets the logging level to DEBUG (lots of additional info)
        --dna-versioned        saves version information in the html and blend filenames
        --dna-overwrite-css    overwrite dna.css, useful when modifying css in the script
 Examples:
-        default:       % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py
-        with options:  % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug
+        default:       % blender2.5 --background --python BlendFileDnaExporter_25.py
+        with options:  % blender2.5 --background --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug


--- a/doc/python_api/rst/include__bmesh.rst
+++ b/doc/python_api/rst/include__bmesh.rst
@ -1,7 +1,7 @@
 ..
   This document is appended to the auto generated BMesh API doc to avoid clogging up the C files with details.
   to test this run:
-   ./blender.bin -b -noaudio -P doc/python_api/sphinx_doc_gen.py -- \
+   ./blender.bin -b -P doc/python_api/sphinx_doc_gen.py -- \
                 --partial bmesh* ; cd doc/python_api ; sphinx-build sphinx-in sphinx-out ; cd ../../


--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@ -7,7 +7,7 @@ API dump in RST files
 ---------------------
  Run this script from Blender's root path once you have compiled Blender

-    blender --background --factory-startup -noaudio --python doc/python_api/sphinx_doc_gen.py
+    blender --background --factory-startup --python doc/python_api/sphinx_doc_gen.py

  This will generate python files in doc/python_api/sphinx-in/
  providing ./blender is or links to the blender executable
@ -239,12 +239,12 @@ BPY_LOGGER.setLevel(logging.DEBUG)
 """
 # for quick rebuilds
 rm -rf /b/doc/python_api/sphinx-* && \
-./blender -b -noaudio --factory-startup -P doc/python_api/sphinx_doc_gen.py && \
+./blender -b --factory-startup -P doc/python_api/sphinx_doc_gen.py && \
 sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out

 or

-./blender -b -noaudio --factory-startup -P doc/python_api/sphinx_doc_gen.py -- -f -B
+./blender -b --factory-startup -P doc/python_api/sphinx_doc_gen.py -- -f -B
 """

 # Switch for quick testing so doc-builds don't take so long.
--- a/intern/cycles/blender/object.cpp
+++ b/intern/cycles/blender/object.cpp
@ -25,7 +25,7 @@
 #include "util/log.h"
 #include "util/task.h"

-#include "BKE_duplilist.h"
+#include "BKE_duplilist.hh"

 CCL_NAMESPACE_BEGIN

--- a/intern/cycles/blender/shader.cpp
+++ b/intern/cycles/blender/shader.cpp
@ -23,7 +23,7 @@
 #include "util/string.h"
 #include "util/task.h"

-#include "BKE_duplilist.h"
+#include "BKE_duplilist.hh"

 CCL_NAMESPACE_BEGIN

--- a/intern/cycles/device/optix/device.cpp
+++ b/intern/cycles/device/optix/device.cpp
@ -13,6 +13,7 @@
 #include "util/log.h"

 #ifdef WITH_OSL
+#  include <OSL/oslconfig.h>
 #  include <OSL/oslversion.h>
 #endif

@ -72,7 +73,8 @@ void device_optix_info(const vector<DeviceInfo> &cuda_devices, vector<DeviceInfo

    info.type = DEVICE_OPTIX;
    info.id += "_OptiX";
-#  if defined(WITH_OSL) && (OSL_VERSION_MINOR >= 13 || OSL_VERSION_MAJOR > 1)
+#  if defined(WITH_OSL) && defined(OSL_USE_OPTIX) && \
+      (OSL_VERSION_MINOR >= 13 || OSL_VERSION_MAJOR > 1)
    info.has_osl = true;
 #  endif
    info.denoisers |= DENOISER_OPTIX;
--- a/release/datafiles/blender_icons_geom_update.py
+++ b/release/datafiles/blender_icons_geom_update.py
@ -76,7 +76,7 @@ for blend in icons_blend:
    output_dir = os.path.join(BASEDIR, "icons")
    files_old = set(names_and_time_from_path(output_dir))
    cmd = (
-        blender_bin, "--background", "--factory-startup", "-noaudio",
+        blender_bin, "--background", "--factory-startup",
        blend,
        "--python", os.path.join(BASEDIR, "blender_icons_geom.py"),
        "--",
--- a/release/datafiles/blender_icons_update.py
+++ b/release/datafiles/blender_icons_update.py
@ -71,7 +71,7 @@ datatoc_icon_split_py = os.path.join(BASEDIR, "..", "..", "source", "blender", "

 # create .dat pixmaps (which are stored in git)
 cmd = (
-    blender_bin, "--background", "--factory-startup", "-noaudio",
+    blender_bin, "--background", "--factory-startup",
    "--python", datatoc_icon_split_py, "--",
    "--image=" + os.path.join(BASEDIR, "blender_icons16.png"),
    "--output=" + os.path.join(BASEDIR, "blender_icons16"),
@ -85,7 +85,7 @@ cmd = (
 run(cmd, env=env)

 cmd = (
-    blender_bin, "--background", "--factory-startup", "-noaudio",
+    blender_bin, "--background", "--factory-startup",
    "--python", datatoc_icon_split_py, "--",
    "--image=" + os.path.join(BASEDIR, "blender_icons32.png"),
    "--output=" + os.path.join(BASEDIR, "blender_icons32"),
--- a/scripts/modules/rna_manual_reference.py
+++ b/scripts/modules/rna_manual_reference.py
@ -262,7 +262,6 @@ url_manual_mapping = (
    ("bpy.types.clothsettings.compression_stiffness_max*", "physics/cloth/settings/property_weights.html#bpy-types-clothsettings-compression-stiffness-max"),
    ("bpy.types.colormanagedsequencercolorspacesettings*", "render/color_management.html#bpy-types-colormanagedsequencercolorspacesettings"),
    ("bpy.types.colormanagedviewsettings.view_transform*", "render/color_management.html#bpy-types-colormanagedviewsettings-view-transform"),
-    ("bpy.types.compositornodetree.use_groupnode_buffer*", "compositing/sidebar.html#bpy-types-compositornodetree-use-groupnode-buffer"),
    ("bpy.types.cyclesmaterialsettings.volume_step_rate*", "render/cycles/material_settings.html#bpy-types-cyclesmaterialsettings-volume-step-rate"),
    ("bpy.types.cyclesobjectsettings.is_caustics_caster*", "render/cycles/object_settings/object_data.html#bpy-types-cyclesobjectsettings-is-caustics-caster"),
    ("bpy.types.cyclesrendersettings.adaptive_threshold*", "render/cycles/render_settings/sampling.html#bpy-types-cyclesrendersettings-adaptive-threshold"),
@ -1023,7 +1022,6 @@ url_manual_mapping = (
    ("bpy.types.compositornodecolorcorrection*", "compositing/types/color/adjust/color_correction.html#bpy-types-compositornodecolorcorrection"),
    ("bpy.types.compositornodemoviedistortion*", "compositing/types/transform/movie_distortion.html#bpy-types-compositornodemoviedistortion"),
    ("bpy.types.compositornodetree.chunk_size*", "compositing/sidebar.html#bpy-types-compositornodetree-chunk-size"),
-    ("bpy.types.compositornodetree.use_opencl*", "compositing/sidebar.html#bpy-types-compositornodetree-use-opencl"),
    ("bpy.types.cyclesrendersettings.caustics*", "render/cycles/render_settings/light_paths.html#bpy-types-cyclesrendersettings-caustics"),
    ("bpy.types.cyclesrendersettings.denoiser*", "render/cycles/render_settings/sampling.html#bpy-types-cyclesrendersettings-denoiser"),
    ("bpy.types.editbone.use_inherit_rotation*", "animation/armatures/bones/properties/relations.html#bpy-types-editbone-use-inherit-rotation"),
--- a/scripts/startup/bl_operators/file.py
+++ b/scripts/startup/bl_operators/file.py
@ -105,7 +105,6 @@ class WM_OT_previews_batch_generate(Operator):
                bpy.app.binary_path,
                "--background",
                "--factory-startup",
-                "-noaudio",
            ]
            if self.use_trusted:
                cmd.append("--enable-autoexec")
@ -215,7 +214,6 @@ class WM_OT_previews_batch_clear(Operator):
                bpy.app.binary_path,
                "--background",
                "--factory-startup",
-                "-noaudio",
            ]
            if self.use_trusted:
                cmd.append("--enable-autoexec")
--- a/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/scripts/startup/bl_ui/node_add_menu_geometry.py
@ -533,7 +533,7 @@ class NODE_MT_category_GEO_UTILITIES(Menu):
    bl_idname = "NODE_MT_category_GEO_UTILITIES"
    bl_label = "Utilities"

-    def draw(self, _context):
+    def draw(self, context):
        layout = self.layout
        layout.menu("NODE_MT_geometry_node_GEO_COLOR")
        layout.menu("NODE_MT_category_GEO_TEXT")
@ -541,6 +541,8 @@ class NODE_MT_category_GEO_UTILITIES(Menu):
        layout.separator()
        layout.menu("NODE_MT_category_GEO_UTILITIES_FIELD")
        layout.menu("NODE_MT_category_GEO_UTILITIES_MATH")
+        if context.preferences.experimental.use_new_matrix_socket:
+            layout.menu("NODE_MT_category_utilities_matrix")
        layout.menu("NODE_MT_category_GEO_UTILITIES_ROTATION")
        layout.menu("NODE_MT_category_GEO_UTILITIES_DEPRECATED")
        layout.separator()
@ -592,6 +594,22 @@ class NODE_MT_category_GEO_UTILITIES_ROTATION(Menu):
        node_add_menu.draw_assets_for_catalog(layout, "Utilities/Rotation")


+class NODE_MT_category_utilities_matrix(Menu):
+    bl_idname = "NODE_MT_category_utilities_matrix"
+    bl_label = "Matrix"
+
+    def draw(self, _context):
+        layout = self.layout
+        node_add_menu.add_node_type(layout, "FunctionNodeCombineTransform")
+        node_add_menu.add_node_type(layout, "FunctionNodeInvertMatrix")
+        node_add_menu.add_node_type(layout, "FunctionNodeMatrixMultiply")
+        node_add_menu.add_node_type(layout, "FunctionNodeSeparateTransform")
+        node_add_menu.add_node_type(layout, "FunctionNodeTransformDirection")
+        node_add_menu.add_node_type(layout, "FunctionNodeTransformPoint")
+        node_add_menu.add_node_type(layout, "FunctionNodeTransposeMatrix")
+        node_add_menu.draw_assets_for_catalog(layout, "Utilities/Matrix")
+
+
 class NODE_MT_category_GEO_UTILITIES_MATH(Menu):
    bl_idname = "NODE_MT_category_GEO_UTILITIES_MATH"
    bl_label = "Math"
@ -779,6 +797,7 @@ classes = (
    NODE_MT_category_GEO_UTILITIES_FIELD,
    NODE_MT_category_GEO_UTILITIES_MATH,
    NODE_MT_category_GEO_UTILITIES_ROTATION,
+    NODE_MT_category_utilities_matrix,
    NODE_MT_category_GEO_UTILITIES_DEPRECATED,
    NODE_MT_category_GEO_GROUP,
 )
--- a/scripts/startup/bl_ui/properties_data_grease_pencil.py
+++ b/scripts/startup/bl_ui/properties_data_grease_pencil.py
@ -51,6 +51,10 @@ class GREASE_PENCIL_MT_grease_pencil_add_layer_extra(Menu):

        layout.operator("grease_pencil.layer_group_add", text="Add Group")

+        layout.separator()
+        layout.operator("grease_pencil.layer_reveal", icon='RESTRICT_VIEW_OFF', text="Show All")
+        layout.operator("grease_pencil.layer_hide", icon='RESTRICT_VIEW_ON', text="Hide Others").unselected = True
+

 class DATA_PT_grease_pencil_layers(DataButtonsPanel, Panel):
    bl_label = "Layers"
--- a/scripts/startup/bl_ui/space_node.py
+++ b/scripts/startup/bl_ui/space_node.py
@ -818,12 +818,9 @@ class NODE_PT_quality(bpy.types.Panel):
        col.active = not use_realtime
        col.prop(tree, "render_quality", text="Render")
        col.prop(tree, "edit_quality", text="Edit")
-        col.prop(tree, "chunk_size")

        col = layout.column()
        col.active = not use_realtime
-        col.prop(tree, "use_opencl")
-        col.prop(tree, "use_groupnode_buffer")
        col.prop(tree, "use_two_pass")
        col.prop(tree, "use_viewer_border")

--- a/scripts/startup/bl_ui/space_userpref.py
+++ b/scripts/startup/bl_ui/space_userpref.py
@ -2662,6 +2662,7 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
                ({"property": "use_sculpt_texture_paint"}, ("blender/blender/issues/96225", "#96225")),
                ({"property": "use_experimental_compositors"}, ("blender/blender/issues/88150", "#88150")),
                ({"property": "use_grease_pencil_version3"}, ("blender/blender/projects/6", "Grease Pencil 3.0")),
+                ({"property": "use_new_matrix_socket"}, ("blender/blender/issues/116067", "Matrix Socket")),
                ({"property": "enable_overlay_next"}, ("blender/blender/issues/102179", "#102179")),
                ({"property": "use_extension_repos"}, ("/blender/blender/issues/106254", "#106254")),
            ),
--- a/scripts/startup/bl_ui/space_view3d.py
+++ b/scripts/startup/bl_ui/space_view3d.py
@ -827,13 +827,21 @@ class VIEW3D_HT_header(Header):
                    depress=(tool_settings.gpencil_selectmode_edit == 'STROKE'),
                ).mode = 'STROKE'

+            if object_mode == 'PAINT_GREASE_PENCIL':
+                row = layout.row(align=True)
+                row.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE')
+
+            if object_mode in {'PAINT_GREASE_PENCIL', 'EDIT', 'WEIGHT_PAINT'}:
                row = layout.row(align=True)
                row.prop(tool_settings, "use_grease_pencil_multi_frame_editing", text="")

-            if object_mode == 'PAINT_GREASE_PENCIL':
-                row = layout.row()
-                sub = row.row(align=True)
-                sub.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE')
+                if object_mode in {'EDIT', 'WEIGHT_PAINT'}:
+                    sub = row.row(align=True)
+                    sub.enabled = tool_settings.use_grease_pencil_multi_frame_editing
+                    sub.popover(
+                        panel="VIEW3D_PT_grease_pencil_multi_frame",
+                        text="Multiframe",
+                    )

        # Grease Pencil (legacy)
        if obj and obj.type == 'GPENCIL' and context.gpencil_data:
@ -7987,6 +7995,25 @@ class VIEW3D_PT_gpencil_multi_frame(Panel):
            layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)


+class VIEW3D_PT_grease_pencil_multi_frame(Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'HEADER'
+    bl_label = "Multi Frame"
+
+    def draw(self, context):
+        layout = self.layout
+        tool_settings = context.tool_settings
+
+        settings = tool_settings.gpencil_sculpt
+
+        col = layout.column(align=True)
+        col.prop(settings, "use_multiframe_falloff")
+
+        # Falloff curve
+        if settings.use_multiframe_falloff:
+            layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
+
+
 # Grease Pencil Object - Curve Editing tools
 class VIEW3D_PT_gpencil_curve_edit(Panel):
    bl_space_type = 'VIEW_3D'
@ -9066,6 +9093,7 @@ classes = (
    VIEW3D_PT_grease_pencil,
    VIEW3D_PT_annotation_onion,
    VIEW3D_PT_gpencil_multi_frame,
+    VIEW3D_PT_grease_pencil_multi_frame,
    VIEW3D_PT_gpencil_curve_edit,
    VIEW3D_PT_gpencil_sculpt_automasking,
    VIEW3D_PT_quad_view,
--- a/source/blender/animrig/ANIM_keyframing.hh
+++ b/source/blender/animrig/ANIM_keyframing.hh
@ -12,6 +12,7 @@

 #include <string>

+#include "BLI_bitmap.h"
 #include "BLI_vector.hh"
 #include "DNA_anim_types.h"
 #include "ED_transform.hh"
@ -192,6 +193,8 @@ bool autokeyframe_property(bContext *C,
 * expected to be the size of the property array.
 * \param frame: is expected to be in the local time of the action, meaning it has to be NLA mapped
 * already.
+ * \param keying_mask is expected to have the same size as `rna_path`. A false bit means that index
+ * will be skipped.
 * \returns The number of keys inserted.
 */
 int insert_key_action(Main *bmain,
@ -202,7 +205,8 @@ int insert_key_action(Main *bmain,
                      float frame,
                      Span<float> values,
                      eInsertKeyFlags insert_key_flag,
-                      eBezTriple_KeyframeType key_type);
+                      eBezTriple_KeyframeType key_type,
+                      const BLI_bitmap *keying_mask);

 /**
 * Insert keys to the ID of the given PointerRNA for the given RNA paths. Tries to create an
@ -215,6 +219,7 @@ void insert_key_rna(PointerRNA *rna_pointer,
                    eInsertKeyFlags insert_key_flags,
                    eBezTriple_KeyframeType key_type,
                    Main *bmain,
-                    ReportList *reports);
+                    ReportList *reports,
+                    const AnimationEvalContext &anim_eval_context);

 }  // namespace blender::animrig
--- a/source/blender/animrig/intern/bone_collections.cc
+++ b/source/blender/animrig/intern/bone_collections.cc
@ -6,10 +6,8 @@
 * \ingroup animrig
 */

-#include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
-#include "BLI_math_color.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.hh"
@ -19,8 +17,6 @@

 #include "DNA_armature_types.h"

-#include "BLI_math_bits.h"
-
 #include "MEM_guardedalloc.h"

 #include "BKE_animsys.h"
@ -440,7 +436,7 @@ void ANIM_armature_bonecoll_active_name_set(bArmature *armature, const char *nam
  ANIM_armature_bonecoll_active_set(armature, bcoll);
 }

-void ANIM_armature_bonecoll_active_runtime_refresh(struct bArmature *armature)
+void ANIM_armature_bonecoll_active_runtime_refresh(bArmature *armature)
 {
  const std::string_view active_name = armature->active_collection_name;
  if (active_name.empty()) {
@ -1062,8 +1058,8 @@ static bool bcoll_list_contains(const ListBase /*BoneCollectionRef*/ *collection
  return false;
 }

-bool ANIM_armature_bonecoll_contains_active_bone(const struct bArmature *armature,
-                                                 const struct BoneCollection *bcoll)
+bool ANIM_armature_bonecoll_contains_active_bone(const bArmature *armature,
+                                                 const BoneCollection *bcoll)
 {
  if (armature->edbo) {
    if (!armature->act_edbone) {
--- a/source/blender/animrig/intern/driver.cc
+++ b/source/blender/animrig/intern/driver.cc
@ -7,7 +7,6 @@
 */

 #include "ANIM_driver.hh"
-#include "BKE_animsys.h"
 #include "BKE_fcurve_driver.h"
 #include "DNA_anim_types.h"
 #include "RNA_access.hh"
--- a/source/blender/animrig/intern/keyframing.cc
+++ b/source/blender/animrig/intern/keyframing.cc
@ -41,7 +41,6 @@
 #include "RNA_path.hh"
 #include "RNA_prototypes.h"

-#include "WM_api.hh"
 #include "WM_types.hh"

 namespace blender::animrig {
@ -863,7 +862,8 @@ int insert_key_action(Main *bmain,
                      const float frame,
                      const Span<float> values,
                      eInsertKeyFlags insert_key_flag,
-                      eBezTriple_KeyframeType key_type)
+                      eBezTriple_KeyframeType key_type,
+                      const BLI_bitmap *keying_mask)
 {
  BLI_assert(bmain != nullptr);
  BLI_assert(action != nullptr);
@ -880,6 +880,10 @@ int insert_key_action(Main *bmain,
  int property_array_index = 0;
  int inserted_keys = 0;
  for (float value : values) {
+    if (!BLI_BITMAP_TEST_BOOL(keying_mask, property_array_index)) {
+      property_array_index++;
+      continue;
+    }
    const bool inserted_key = insert_keyframe_fcurve_value(bmain,
                                                           nullptr,
                                                           ptr,
@ -925,7 +929,8 @@ void insert_key_rna(PointerRNA *rna_pointer,
                    const eInsertKeyFlags insert_key_flags,
                    const eBezTriple_KeyframeType key_type,
                    Main *bmain,
-                    ReportList *reports)
+                    ReportList *reports,
+                    const AnimationEvalContext &anim_eval_context)
 {
  ID *id = rna_pointer->owner_id;
  bAction *action = id_action_ensure(bmain, id);
@ -939,6 +944,15 @@ void insert_key_rna(PointerRNA *rna_pointer,
  }

  AnimData *adt = BKE_animdata_from_id(id);
+
+  /* Keyframing functions can deal with the nla_context being a nullptr. */
+  ListBase nla_cache = {nullptr, nullptr};
+  NlaKeyframingContext *nla_context = nullptr;
+  if (adt && adt->action == action) {
+    nla_context = BKE_animsys_get_nla_keyframing_context(
+        &nla_cache, rna_pointer, adt, &anim_eval_context);
+  }
+
  const float nla_frame = BKE_nla_tweakedit_remap(adt, scene_frame, NLATIME_CONVERT_UNMAP);
  const bool visual_keyframing = insert_key_flags & INSERTKEY_MATRIX;

@ -961,6 +975,16 @@ void insert_key_rna(PointerRNA *rna_pointer,
                                                                                        prop);
    Vector<float> rna_values = get_keyframe_values(&ptr, prop, visual_keyframing);

+    BLI_bitmap *successful_remaps = BLI_BITMAP_NEW(rna_values.size(), __func__);
+    BKE_animsys_nla_remap_keyframe_values(nla_context,
+                                          rna_pointer,
+                                          prop,
+                                          rna_values.as_mutable_span(),
+                                          -1,
+                                          &anim_eval_context,
+                                          nullptr,
+                                          successful_remaps);
+
    insert_key_count += insert_key_action(bmain,
                                          action,
                                          rna_pointer,
@ -969,7 +993,9 @@ void insert_key_rna(PointerRNA *rna_pointer,
                                          nla_frame,
                                          rna_values.as_span(),
                                          insert_key_flags,
-                                          key_type);
+                                          key_type,
+                                          successful_remaps);
+    MEM_freeN(successful_remaps);
  }

  if (insert_key_count == 0) {
--- a/source/blender/animrig/intern/keyframing_auto.cc
+++ b/source/blender/animrig/intern/keyframing_auto.cc
@ -9,8 +9,6 @@
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
 #include "BKE_fcurve.h"
-#include "BKE_layer.hh"
-#include "BKE_object.hh"
 #include "BKE_scene.hh"

 #include "BLI_listbase.h"
@ -22,11 +20,8 @@
 #include "RNA_prototypes.h"

 #include "ED_keyframing.hh"
-#include "ED_scene.hh"
-#include "ED_transform.hh"

 #include "ANIM_keyframing.hh"
-#include "ANIM_rna.hh"

 #include "WM_api.hh"
 #include "WM_types.hh"
@ -165,7 +160,8 @@ void autokeyframe_object(bContext *C, Scene *scene, Object *ob, Span<std::string
                   flag,
                   eBezTriple_KeyframeType(scene->toolsettings->keyframe_type),
                   bmain,
-                   reports);
+                   reports,
+                   anim_eval_context);
  }
 }

@ -290,7 +286,8 @@ void autokeyframe_pose_channel(bContext *C,
                   flag,
                   eBezTriple_KeyframeType(scene->toolsettings->keyframe_type),
                   bmain,
-                   reports);
+                   reports,
+                   anim_eval_context);
  }
 }

--- a/source/blender/animrig/intern/visualkey.cc
+++ b/source/blender/animrig/intern/visualkey.cc
@ -12,12 +12,10 @@
 #include "ANIM_rna.hh"
 #include "ANIM_visualkey.hh"

-#include "BKE_animsys.h"
 #include "BKE_armature.hh"

 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
-#include "BLI_math_vector.h"

 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
@ -25,7 +23,6 @@

 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
-#include "RNA_types.hh"

 namespace blender::animrig {

@ -214,11 +211,11 @@ Vector<float> visualkey_get_values(PointerRNA *ptr, PropertyRNA *prop)
    Object *ob = static_cast<Object *>(ptr->data);
    /* Loc code is specific... */
    if (strstr(identifier, "location")) {
-      values.extend({ob->object_to_world[3], 3});
+      values.extend({ob->object_to_world().location(), 3});
      return values;
    }

-    copy_m4_m4(tmat, ob->object_to_world);
+    copy_m4_m4(tmat, ob->object_to_world().ptr());
    rotmode = ob->rotmode;
  }
  else if (ptr->type == &RNA_PoseBone) {
--- a/source/blender/asset_system/AS_asset_library.hh
+++ b/source/blender/asset_system/AS_asset_library.hh
@ -21,9 +21,12 @@

 #include "BKE_callbacks.hh"

-struct IDRemapper;
 struct Main;

+namespace blender::bke::id {
+class IDRemapper;
+}
+
 namespace blender::asset_system {

 class AssetIdentifier;
@ -143,7 +146,7 @@ class AssetLibrary {
   * mapped to null (typically when an ID gets removed), the asset is removed, because we don't
   * support such empty/null assets.
   */
-  void remap_ids_and_remove_invalid(const IDRemapper &mappings);
+  void remap_ids_and_remove_invalid(const blender::bke::id::IDRemapper &mappings);

  /**
   * Update `catalog_simple_name` by looking up the asset's catalog by its ID.
@ -265,7 +268,7 @@ bool AS_asset_library_has_any_unsaved_catalogs(void);
 * An asset library can include local IDs (IDs in the current file). Their pointers need to be
 * remapped on change (or assets removed as IDs gets removed).
 */
-void AS_asset_library_remap_ids(const IDRemapper *mappings);
+void AS_asset_library_remap_ids(const blender::bke::id::IDRemapper &mappings);

 /**
 * Attempt to resolve a full path to an asset based on the currently available (not necessary
--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@ -13,6 +13,7 @@
 #include "AS_asset_library.hh"
 #include "AS_asset_representation.hh"

+#include "BKE_lib_remap.hh"
 #include "BKE_main.hh"
 #include "BKE_preferences.h"

@ -117,12 +118,11 @@ void AS_asset_library_refresh_catalog_simplename(AssetLibrary *asset_library,
  asset_library->refresh_catalog_simplename(asset_data);
 }

-void AS_asset_library_remap_ids(const IDRemapper *mappings)
+void AS_asset_library_remap_ids(const bke::id::IDRemapper &mappings)
 {
  AssetLibraryService *service = AssetLibraryService::get();
  service->foreach_loaded_asset_library(
-      [mappings](AssetLibrary &library) { library.remap_ids_and_remove_invalid(*mappings); },
-      true);
+      [mappings](AssetLibrary &library) { library.remap_ids_and_remove_invalid(mappings); }, true);
 }

 void AS_asset_full_path_explode_from_weak_ref(const AssetWeakReference *asset_reference,
@ -239,7 +239,7 @@ bool AssetLibrary::remove_asset(AssetRepresentation &asset)
  return asset_storage_->remove_asset(asset);
 }

-void AssetLibrary::remap_ids_and_remove_invalid(const IDRemapper &mappings)
+void AssetLibrary::remap_ids_and_remove_invalid(const bke::id::IDRemapper &mappings)
 {
  asset_storage_->remap_ids_and_remove_invalid(mappings);
 }
--- a/source/blender/asset_system/intern/asset_storage.cc
+++ b/source/blender/asset_system/intern/asset_storage.cc
@ -43,7 +43,7 @@ bool AssetStorage::remove_asset(AssetRepresentation &asset)
  return external_assets_.remove_as(&asset);
 }

-void AssetStorage::remap_ids_and_remove_invalid(const IDRemapper &mappings)
+void AssetStorage::remap_ids_and_remove_invalid(const blender::bke::id::IDRemapper &mappings)
 {
  Set<AssetRepresentation *> removed_assets{};

@ -51,8 +51,8 @@ void AssetStorage::remap_ids_and_remove_invalid(const IDRemapper &mappings)
    AssetRepresentation &asset = *asset_ptr;
    BLI_assert(asset.is_local_id());

-    const IDRemapperApplyResult result = BKE_id_remapper_apply(
-        &mappings, &asset.local_asset_id_, ID_REMAP_APPLY_DEFAULT);
+    const IDRemapperApplyResult result = mappings.apply(&asset.local_asset_id_,
+                                                        ID_REMAP_APPLY_DEFAULT);

    /* Entirely remove assets whose ID is unset. We don't want assets with a null ID pointer. */
    if (result == ID_REMAP_RESULT_SOURCE_UNASSIGNED) {
--- a/source/blender/asset_system/intern/asset_storage.hh
+++ b/source/blender/asset_system/intern/asset_storage.hh
@ -17,7 +17,10 @@

 struct AssetMetaData;
 struct ID;
-struct IDRemapper;
+
+namespace blender::bke::id {
+class IDRemapper;
+}

 namespace blender::asset_system {

@ -49,7 +52,7 @@ class AssetStorage {
  bool remove_asset(AssetRepresentation &asset);

  /** See #AssetLibrary::remap_ids_and_remove_nulled(). */
-  void remap_ids_and_remove_invalid(const IDRemapper &mappings);
+  void remap_ids_and_remove_invalid(const blender::bke::id::IDRemapper &mappings);
 };

 }  // namespace blender::asset_system
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@ -46,7 +46,7 @@
 #include "blf_internal.hh"
 #include "blf_internal_types.hh"

-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */

 #ifdef WIN32
 #  define FT_New_Face FT_New_Face__win32_compat
--- a/source/blender/blenfont/intern/blf_glyph.cc
+++ b/source/blender/blenfont/intern/blf_glyph.cc
@ -38,9 +38,10 @@
 #include "blf_internal_types.hh"

 #include "BLI_math_vector.h"
-#include "BLI_strict_flags.h"
 #include "BLI_string_utf8.h"

+#include "BLI_strict_flags.h" /* Keep last. */
+
 /**
 * Convert glyph coverage amounts to lightness values. Uses a LUT that perceptually improves
 * anti-aliasing and results in text that looks a bit fuller and slightly brighter. This should
--- a/source/blender/blenfont/intern/blf_internal_types.hh
+++ b/source/blender/blenfont/intern/blf_internal_types.hh
@ -11,13 +11,19 @@
 #include "GPU_texture.h"
 #include "GPU_vertex_buffer.h"

+struct ColorManagedDisplay;
+struct FontBLF;
+struct GPUBatch;
+struct GPUVertBuf;
+struct GPUVertBufRaw;
+
 #include FT_MULTIPLE_MASTERS_H /* Variable font support. */

 /** Maximum variation axes per font. */
 #define BLF_VARIATIONS_MAX 16

 #define MAKE_DVAR_TAG(a, b, c, d) \
-  (((uint32_t)a << 24u) | ((uint32_t)b << 16u) | ((uint32_t)c << 8u) | ((uint32_t)d))
+  ((uint32_t(a) << 24u) | (uint32_t(b) << 16u) | (uint32_t(c) << 8u) | (uint32_t(d)))

 #define BLF_VARIATION_AXIS_WEIGHT MAKE_DVAR_TAG('w', 'g', 'h', 't')  /* 'wght' weight axis. */
 #define BLF_VARIATION_AXIS_SLANT MAKE_DVAR_TAG('s', 'l', 'n', 't')   /* 'slnt' slant axis. */
@ -44,27 +50,27 @@ typedef int32_t ft_pix;
 #define FT_PIX_ROUND(x) FT_PIX_FLOOR((x) + 32)
 #define FT_PIX_CEIL(x) ((x) + 63)

-BLI_INLINE int ft_pix_to_int(ft_pix v)
+inline int ft_pix_to_int(ft_pix v)
 {
-  return (int)(v >> 6);
+  return int(v >> 6);
 }

-BLI_INLINE int ft_pix_to_int_floor(ft_pix v)
+inline int ft_pix_to_int_floor(ft_pix v)
 {
-  return (int)(v >> 6); /* No need for explicit floor as the bits are removed when shifting. */
+  return int(v >> 6); /* No need for explicit floor as the bits are removed when shifting. */
 }

-BLI_INLINE int ft_pix_to_int_ceil(ft_pix v)
+inline int ft_pix_to_int_ceil(ft_pix v)
 {
-  return (int)(FT_PIX_CEIL(v) >> 6);
+  return int(FT_PIX_CEIL(v) >> 6);
 }

-BLI_INLINE ft_pix ft_pix_from_int(int v)
+inline ft_pix ft_pix_from_int(int v)
 {
  return v * 64;
 }

-BLI_INLINE ft_pix ft_pix_from_float(float v)
+inline ft_pix ft_pix_from_float(float v)
 {
  return lroundf(v * 64.0f);
 }
@ -79,12 +85,12 @@ BLI_INLINE ft_pix ft_pix_from_float(float v)
 /** A value in the kerning cache that indicates it is not yet set. */
 #define KERNING_ENTRY_UNSET INT_MAX

-typedef struct BatchBLF {
+struct BatchBLF {
  /** Can only batch glyph from the same font. */
-  struct FontBLF *font;
-  struct GPUBatch *batch;
-  struct GPUVertBuf *verts;
-  struct GPUVertBufRaw pos_step, col_step, offset_step, glyph_size_step, glyph_comp_len_step,
+  FontBLF *font;
+  GPUBatch *batch;
+  GPUVertBuf *verts;
+  GPUVertBufRaw pos_step, col_step, offset_step, glyph_size_step, glyph_comp_len_step,
      glyph_mode_step;
  unsigned int pos_loc, col_loc, offset_loc, glyph_size_loc, glyph_comp_len_loc, glyph_mode_loc;
  unsigned int glyph_len;
@ -93,22 +99,22 @@ typedef struct BatchBLF {
  /* Previous call `modelmatrix`. */
  float mat[4][4];
  bool enabled, active, simple_shader;
-  struct GlyphCacheBLF *glyph_cache;
-} BatchBLF;
+  GlyphCacheBLF *glyph_cache;
+};

 extern BatchBLF g_batch;

-typedef struct KerningCacheBLF {
+struct KerningCacheBLF {
  /**
   * Cache a ascii glyph pairs. Only store the x offset we are interested in,
   * instead of the full #FT_Vector since it's not used for drawing at the moment.
   */
  int ascii_table[KERNING_CACHE_TABLE_SIZE][KERNING_CACHE_TABLE_SIZE];
-} KerningCacheBLF;
+};

-typedef struct GlyphCacheBLF {
-  struct GlyphCacheBLF *next;
-  struct GlyphCacheBLF *prev;
+struct GlyphCacheBLF {
+  GlyphCacheBLF *next;
+  GlyphCacheBLF *prev;

  /** Font size. */
  float size;
@ -133,12 +139,11 @@ typedef struct GlyphCacheBLF {
  int bitmap_len;
  int bitmap_len_landed;
  int bitmap_len_alloc;
+};

-} GlyphCacheBLF;
-
-typedef struct GlyphBLF {
-  struct GlyphBLF *next;
-  struct GlyphBLF *prev;
+struct GlyphBLF {
+  GlyphBLF *next;
+  GlyphBLF *prev;

  /** The character, as UTF-32. */
  unsigned int c;
@ -183,10 +188,10 @@ typedef struct GlyphBLF {
   */
  int pos[2];

-  struct GlyphCacheBLF *glyph_cache;
-} GlyphBLF;
+  GlyphCacheBLF *glyph_cache;
+};

-typedef struct FontBufInfoBLF {
+struct FontBufInfoBLF {
  /** For draw to buffer, always set this to NULL after finish! */
  float *fbuf;

@ -200,17 +205,16 @@ typedef struct FontBufInfoBLF {
  int ch;

  /** Display device used for color management. */
-  struct ColorManagedDisplay *display;
+  ColorManagedDisplay *display;

  /** The color, the alphas is get from the glyph! (color is sRGB space). */
  float col_init[4];
  /** Cached conversion from 'col_init'. */
  unsigned char col_char[4];
  float col_float[4];
+};

-} FontBufInfoBLF;
-
-typedef struct FontMetrics {
+struct FontMetrics {
  /** Indicate that these values have been properly loaded. */
  bool valid;
  /** This font's default weight, 100-900, 400 is normal. */
@ -274,9 +278,9 @@ typedef struct FontMetrics {
  short superscript_xoffset;
  /** Positive (!) number of font units below baseline for subscript characters. */
  short superscript_yoffset;
-} FontMetrics;
+};

-typedef struct FontBLF {
+struct FontBLF {
  /** Full path to font file or NULL if from memory. */
  char *filepath;

@ -382,4 +386,4 @@ typedef struct FontBLF {

  /** Mutex lock for glyph cache. */
  ThreadMutex glyph_cache_mutex;
-} FontBLF;
+};
--- a/source/blender/blenfont/intern/blf_thumbs.cc
+++ b/source/blender/blenfont/intern/blf_thumbs.cc
@ -33,7 +33,7 @@

 #include "BLF_api.hh"

-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */

 /* Maximum length of text sample in char32_t, including nullptr terminator. */
 #define BLF_SAMPLE_LEN 5
--- a/source/blender/blenkernel/BKE_attribute_math.hh
+++ b/source/blender/blenkernel/BKE_attribute_math.hh
@ -35,7 +35,8 @@ inline void convert_to_static_type(const CPPType &cpp_type, const Func &func)
                              int8_t,
                              ColorGeometry4f,
                              ColorGeometry4b,
-                              math::Quaternion>([&](auto type_tag) {
+                              math::Quaternion,
+                              float4x4>([&](auto type_tag) {
    using T = typename decltype(type_tag)::type;
    if constexpr (std::is_same_v<T, void>) {
      /* It's expected that the given cpp type is one of the supported ones. */
@ -517,6 +518,26 @@ class ColorGeometry4bMixer {
  void finalize(const IndexMask &mask);
 };

+class float4x4Mixer {
+ private:
+  MutableSpan<float4x4> buffer_;
+  Array<float> total_weights_;
+  Array<float3> location_buffer_;
+  Array<float3> expmap_buffer_;
+  Array<float3> scale_buffer_;
+
+ public:
+  float4x4Mixer(MutableSpan<float4x4> buffer);
+  /**
+   * \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
+   */
+  float4x4Mixer(MutableSpan<float4x4> buffer, const IndexMask &mask);
+  void set(int64_t index, const float4x4 &value, float weight = 1.0f);
+  void mix_in(int64_t index, const float4x4 &value, float weight = 1.0f);
+  void finalize();
+  void finalize(const IndexMask &mask);
+};
+
 template<typename T> struct DefaultMixerStruct {
  /* Use void by default. This can be checked for in `if constexpr` statements. */
  using type = void;
@ -538,6 +559,9 @@ template<> struct DefaultMixerStruct<ColorGeometry4f> {
 template<> struct DefaultMixerStruct<ColorGeometry4b> {
  using type = ColorGeometry4bMixer;
 };
+template<> struct DefaultMixerStruct<float4x4> {
+  using type = float4x4Mixer;
+};
 template<> struct DefaultMixerStruct<int> {
  static double int_to_double(const int &value)
  {
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@ -29,7 +29,7 @@ extern "C" {

 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 2
+#define BLENDER_FILE_SUBVERSION 3

 /* Minimum Blender version that supports reading file written with the current
 * version. Older Blender versions will test this and cancel loading the file, showing a warning to
--- a/source/blender/blenkernel/BKE_bpath.hh
+++ b/source/blender/blenkernel/BKE_bpath.hh
@ -75,10 +75,10 @@ struct BPathForeachPathData;
 * \return `true` if the path has been changed, and in that case,
 * result must be written to `path_dst`.
 */
-typedef bool (*BPathForeachPathFunctionCallback)(BPathForeachPathData *bpath_data,
-                                                 char *path_dst,
-                                                 size_t path_dst_maxncpy,
-                                                 const char *path_src);
+using BPathForeachPathFunctionCallback = bool (*)(BPathForeachPathData *bpath_data,
+                                                  char *path_dst,
+                                                  size_t path_dst_maxncpy,
+                                                  const char *path_src);

 /** Storage for common data needed across the BPath 'foreach_path' code. */
 struct BPathForeachPathData {
--- a/source/blender/blenkernel/BKE_callbacks.hh
+++ b/source/blender/blenkernel/BKE_callbacks.hh
@ -69,7 +69,7 @@ struct PointerRNA;
 * All callbacks here must be exposed via the Python module `bpy.app.handlers`,
 * see `bpy_app_handlers.cc`.
 */
-typedef enum {
+enum eCbEvent {
  BKE_CB_EVT_FRAME_CHANGE_PRE,
  BKE_CB_EVT_FRAME_CHANGE_POST,
  BKE_CB_EVT_RENDER_PRE,
@ -111,7 +111,7 @@ typedef enum {
  BKE_CB_EVT_EXTENSION_REPOS_SYNC,
  BKE_CB_EVT_EXTENSION_REPOS_UPGRADE,
  BKE_CB_EVT_TOT,
-} eCbEvent;
+};

 struct bCallbackFuncStore {
  bCallbackFuncStore *next, *prev;
--- a/source/blender/blenkernel/BKE_collection.hh
+++ b/source/blender/blenkernel/BKE_collection.hh
@ -305,8 +305,8 @@ void BKE_collection_blend_read_data(BlendDataReader *reader, Collection *collect

 /* Iteration callbacks. */

-typedef void (*BKE_scene_objects_Cb)(Object *ob, void *data);
-typedef void (*BKE_scene_collections_Cb)(Collection *ob, void *data);
+using BKE_scene_objects_Cb = void (*)(Object *ob, void *data);
+using BKE_scene_collections_Cb = void (*)(Collection *ob, void *data);

 /* Iteration over objects in collection. */

--- a/source/blender/blenkernel/BKE_curve.hh
+++ b/source/blender/blenkernel/BKE_curve.hh
@ -32,7 +32,7 @@ struct Object;
 struct rctf;
 struct TextBox;

-typedef int eBezTriple_Flag__Alias;
+using eBezTriple_Flag__Alias = int;

 struct CurveCache {
  ListBase disp;
--- a/source/blender/blenkernel/BKE_customdata.hh
+++ b/source/blender/blenkernel/BKE_customdata.hh
@ -73,7 +73,7 @@ extern const CustomData_MeshMasks CD_MASK_EVERYTHING;
 * CD_NUMTYPES elements, that indicate if a layer can be copied. */

 /** Add/copy/merge allocation types. */
-typedef enum eCDAllocType {
+enum eCDAllocType {
  /** Allocate and set to default, which is usually just zeroed memory. */
  CD_SET_DEFAULT = 2,
  /**
@ -81,18 +81,18 @@ typedef enum eCDAllocType {
   * if all layer values will be set by the caller after creating the layer.
   */
  CD_CONSTRUCT = 5,
-} eCDAllocType;
+};

 #define CD_TYPE_AS_MASK(_type) (eCustomDataMask)((eCustomDataMask)1 << (eCustomDataMask)(_type))

 void customData_mask_layers__print(const CustomData_MeshMasks *mask);

-typedef void (*cd_interp)(
+using cd_interp = void (*)(
    const void **sources, const float *weights, const float *sub_weights, int count, void *dest);
-typedef void (*cd_copy)(const void *source, void *dest, int count);
-typedef void (*cd_set_default_value)(void *data, int count);
-typedef void (*cd_free)(void *data, int count);
-typedef bool (*cd_validate)(void *item, uint totitems, bool do_fixes);
+using cd_copy = void (*)(const void *source, void *dest, int count);
+using cd_set_default_value = void (*)(void *data, int count);
+using cd_free = void (*)(void *data, int count);
+using cd_validate = bool (*)(void *item, uint totitems, bool do_fixes);

 /**
 * Update mask_dst with layers defined in mask_src (equivalent to a bit-wise OR).
--- a/source/blender/blenkernel/BKE_duplilist.hh
+++ b/source/blender/blenkernel/BKE_duplilist.hh
@ -1,25 +1,13 @@
 /* SPDX-FileCopyrightText: 2001-2002 NaN Holding BV. All rights reserved.
 *
 * SPDX-License-Identifier: GPL-2.0-or-later */
+
 #pragma once

 /** \file
 * \ingroup bke
 */

-#ifdef __cplusplus
-namespace blender::bke {
-struct GeometrySet;
-}
-using GeometrySetHandle = blender::bke::GeometrySet;
-#else
-typedef struct GeometrySetHandle GeometrySetHandle;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Depsgraph;
 struct ID;
 struct ListBase;
@ -28,6 +16,9 @@ struct ParticleSystem;
 struct Scene;
 struct ViewLayer;
 struct ViewerPath;
+namespace blender::bke {
+struct GeometrySet;
+}

 /* ---------------------------------------------------- */
 /* Dupli-Geometry */
@ -35,31 +26,29 @@ struct ViewerPath;
 /**
 * \return a #ListBase of #DupliObject.
 */
-struct ListBase *object_duplilist(struct Depsgraph *depsgraph,
-                                  struct Scene *sce,
-                                  struct Object *ob);
+ListBase *object_duplilist(Depsgraph *depsgraph, Scene *sce, Object *ob);
 /**
 * \return a #ListBase of #DupliObject for the preview geometry referenced by the #ViewerPath.
 */
-struct ListBase *object_duplilist_preview(struct Depsgraph *depsgraph,
-                                          struct Scene *scene,
-                                          struct Object *ob,
-                                          const struct ViewerPath *viewer_path);
-void free_object_duplilist(struct ListBase *lb);
+ListBase *object_duplilist_preview(Depsgraph *depsgraph,
+                                   Scene *scene,
+                                   Object *ob,
+                                   const ViewerPath *viewer_path);
+void free_object_duplilist(ListBase *lb);

-typedef struct DupliObject {
-  struct DupliObject *next, *prev;
+struct DupliObject {
+  DupliObject *next, *prev;
  /* Object whose geometry is instanced. */
-  struct Object *ob;
+  Object *ob;
  /* Data owned by the object above that is instanced. This might not be the same as `ob->data`. */
-  struct ID *ob_data;
+  ID *ob_data;
  float mat[4][4];
  float orco[3], uv[2];

  short type; /* from Object.transflag */
  char no_draw;
  /* If this dupli object is belongs to a preview, this is non-null. */
-  const GeometrySetHandle *preview_base_geometry;
+  const blender::bke::GeometrySet *preview_base_geometry;
  /* Index of the top-level instance this dupli is part of or -1 when unused. */
  int preview_instance_index;

@ -68,7 +57,7 @@ typedef struct DupliObject {
  int persistent_id[8]; /* MAX_DUPLI_RECUR */

  /* Particle this dupli was generated from. */
-  struct ParticleSystem *particle_system;
+  ParticleSystem *particle_system;

  /* Geometry set stack for instance attributes; for each level lists the
   * geometry set and instance index within it.
@ -79,19 +68,19 @@ typedef struct DupliObject {
   * size between 1 and MAX_DUPLI_RECUR can be used without issues.
   */
  int instance_idx[4];
-  const GeometrySetHandle *instance_data[4];
+  const blender::bke::GeometrySet *instance_data[4];

  /* Random ID for shading */
  unsigned int random_id;
-} DupliObject;
+};

 /**
 * Look up the RGBA value of a uniform shader attribute.
 * \return true if the attribute was found; if not, r_value is also set to zero.
 */
-bool BKE_object_dupli_find_rgba_attribute(const struct Object *ob,
-                                          const struct DupliObject *dupli,
-                                          const struct Object *dupli_parent,
+bool BKE_object_dupli_find_rgba_attribute(const Object *ob,
+                                          const DupliObject *dupli,
+                                          const Object *dupli_parent,
                                          const char *name,
                                          float r_value[4]);

@ -99,11 +88,7 @@ bool BKE_object_dupli_find_rgba_attribute(const struct Object *ob,
 * Look up the RGBA value of a view layer/scene/world shader attribute.
 * \return true if the attribute was found; if not, r_value is also set to zero.
 */
-bool BKE_view_layer_find_rgba_attribute(const struct Scene *scene,
-                                        const struct ViewLayer *layer,
+bool BKE_view_layer_find_rgba_attribute(const Scene *scene,
+                                        const ViewLayer *layer,
                                        const char *name,
                                        float r_value[4]);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/blenkernel/BKE_idtype.hh
+++ b/source/blender/blenkernel/BKE_idtype.hh
@ -60,40 +60,40 @@ bool BKE_idtype_cache_key_cmp(const void *key_a_v, const void *key_b_v);

 /* ********** Prototypes for #IDTypeInfo callbacks. ********** */

-typedef void (*IDTypeInitDataFunction)(ID *id);
+using IDTypeInitDataFunction = void (*)(ID *id);

 /** \param flag: Copying options (see BKE_lib_id.hh's LIB_ID_COPY_... flags for more). */
-typedef void (*IDTypeCopyDataFunction)(Main *bmain, ID *id_dst, const ID *id_src, int flag);
+using IDTypeCopyDataFunction = void (*)(Main *bmain, ID *id_dst, const ID *id_src, int flag);

-typedef void (*IDTypeFreeDataFunction)(ID *id);
+using IDTypeFreeDataFunction = void (*)(ID *id);

 /** \param flags: See BKE_lib_id.hh's LIB_ID_MAKELOCAL_... flags. */
-typedef void (*IDTypeMakeLocalFunction)(Main *bmain, ID *id, int flags);
+using IDTypeMakeLocalFunction = void (*)(Main *bmain, ID *id, int flags);

-typedef void (*IDTypeForeachIDFunction)(ID *id, LibraryForeachIDData *data);
+using IDTypeForeachIDFunction = void (*)(ID *id, LibraryForeachIDData *data);

-typedef enum eIDTypeInfoCacheCallbackFlags {
+enum eIDTypeInfoCacheCallbackFlags {
  /** Indicates to the callback that cache may be stored in the .blend file,
   * so its pointer should not be cleared at read-time. */
  IDTYPE_CACHE_CB_FLAGS_PERSISTENT = 1 << 0,
-} eIDTypeInfoCacheCallbackFlags;
-typedef void (*IDTypeForeachCacheFunctionCallback)(
-    ID *id, const IDCacheKey *cache_key, void **cache_p, uint flags, void *user_data);
-typedef void (*IDTypeForeachCacheFunction)(ID *id,
-                                           IDTypeForeachCacheFunctionCallback function_callback,
-                                           void *user_data);
+};
+using IDTypeForeachCacheFunctionCallback =
+    void (*)(ID *id, const IDCacheKey *cache_key, void **cache_p, uint flags, void *user_data);
+using IDTypeForeachCacheFunction = void (*)(ID *id,
+                                            IDTypeForeachCacheFunctionCallback function_callback,
+                                            void *user_data);

-typedef void (*IDTypeForeachPathFunction)(ID *id, BPathForeachPathData *bpath_data);
+using IDTypeForeachPathFunction = void (*)(ID *id, BPathForeachPathData *bpath_data);

-typedef ID **(*IDTypeEmbeddedOwnerPointerGetFunction)(ID *id);
+using IDTypeEmbeddedOwnerPointerGetFunction = ID **(*)(ID *id);

-typedef void (*IDTypeBlendWriteFunction)(BlendWriter *writer, ID *id, const void *id_address);
-typedef void (*IDTypeBlendReadDataFunction)(BlendDataReader *reader, ID *id);
-typedef void (*IDTypeBlendReadAfterLiblinkFunction)(BlendLibReader *reader, ID *id);
+using IDTypeBlendWriteFunction = void (*)(BlendWriter *writer, ID *id, const void *id_address);
+using IDTypeBlendReadDataFunction = void (*)(BlendDataReader *reader, ID *id);
+using IDTypeBlendReadAfterLiblinkFunction = void (*)(BlendLibReader *reader, ID *id);

-typedef void (*IDTypeBlendReadUndoPreserve)(BlendLibReader *reader, ID *id_new, ID *id_old);
+using IDTypeBlendReadUndoPreserve = void (*)(BlendLibReader *reader, ID *id_new, ID *id_old);

-typedef void (*IDTypeLibOverrideApplyPost)(ID *id_dst, ID *id_src);
+using IDTypeLibOverrideApplyPost = void (*)(ID *id_dst, ID *id_src);

 struct IDTypeInfo {
  /* ********** General IDType data. ********** */
--- a/source/blender/blenkernel/BKE_lib_id.hh
+++ b/source/blender/blenkernel/BKE_lib_id.hh
@ -212,7 +212,7 @@ ID *BKE_libblock_find_name_and_library(Main *bmain,
 * Duplicate (a.k.a. deep copy) common processing options.
 * See also eDupli_ID_Flags for options controlling what kind of IDs to duplicate.
 */
-typedef enum eLibIDDuplicateFlags {
+enum eLibIDDuplicateFlags {
  /** This call to a duplicate function is part of another call for some parent ID.
   * Therefore, this sub-process should not clear `newid` pointers, nor handle remapping itself.
   * NOTE: In some cases (like Object one), the duplicate function may be called on the root ID
@ -222,7 +222,7 @@ typedef enum eLibIDDuplicateFlags {
  /** This call is performed on a 'root' ID, and should therefore perform some decisions regarding
   * sub-IDs (dependencies), check for linked vs. locale data, etc. */
  LIB_ID_DUPLICATE_IS_ROOT_ID = 1 << 1,
-} eLibIDDuplicateFlags;
+};

 ENUM_OPERATORS(eLibIDDuplicateFlags, LIB_ID_DUPLICATE_IS_ROOT_ID)

--- a/source/blender/blenkernel/BKE_lib_query.hh
+++ b/source/blender/blenkernel/BKE_lib_query.hh
@ -141,7 +141,7 @@ struct LibraryIDLinkCallbackData {
 *
 * \return a set of flags to control further iteration (0 to keep going).
 */
-typedef int (*LibraryIDLinkCallback)(LibraryIDLinkCallbackData *cb_data);
+using LibraryIDLinkCallback = int (*)(LibraryIDLinkCallbackData *cb_data);

 /* Flags for the foreach function itself. */
 enum {
--- a/source/blender/blenkernel/BKE_lib_remap.hh
+++ b/source/blender/blenkernel/BKE_lib_remap.hh
@ -21,13 +21,17 @@
 */

 #include "BLI_compiler_attrs.h"
+#include "BLI_map.hh"
 #include "BLI_span.hh"
 #include "BLI_utildefines.h"

 struct ID;
-struct IDRemapper;
 struct Main;

+namespace blender::bke::id {
+class IDRemapper;
+}
+
 /* BKE_libblock_free, delete are declared in BKE_lib_id.hh for convenience. */

 /* Also IDRemap->flag. */
@ -124,9 +128,13 @@ enum eIDRemapType {
 *
 * \note Is preferred over BKE_libblock_remap_locked due to performance.
 */
-void BKE_libblock_remap_multiple_locked(Main *bmain, IDRemapper *mappings, const int remap_flags);
+void BKE_libblock_remap_multiple_locked(Main *bmain,
+                                        blender::bke::id::IDRemapper &mappings,
+                                        const int remap_flags);

-void BKE_libblock_remap_multiple(Main *bmain, IDRemapper *mappings, const int remap_flags);
+void BKE_libblock_remap_multiple(Main *bmain,
+                                 blender::bke::id::IDRemapper &mappings,
+                                 const int remap_flags);

 /**
 * Bare raw remapping of IDs, with no other processing than actually updating the ID pointers.
@ -137,7 +145,9 @@ void BKE_libblock_remap_multiple(Main *bmain, IDRemapper *mappings, const int re
 * case e.g. in read-file process.
 *
 * WARNING: This call will likely leave the given BMain in invalid state in many aspects. */
-void BKE_libblock_remap_multiple_raw(Main *bmain, IDRemapper *mappings, const int remap_flags);
+void BKE_libblock_remap_multiple_raw(Main *bmain,
+                                     blender::bke::id::IDRemapper &mappings,
+                                     const int remap_flags);
 /**
 * Replace all references in given Main to \a old_id by \a new_id
 * (if \a new_id is NULL, it unlinks \a old_id).
@ -178,7 +188,7 @@ void BKE_libblock_relink_ex(Main *bmain, void *idv, void *old_idv, void *new_idv
 void BKE_libblock_relink_multiple(Main *bmain,
                                  const blender::Span<ID *> ids,
                                  eIDRemapType remap_type,
-                                  IDRemapper *id_remapper,
+                                  blender::bke::id::IDRemapper &id_remapper,
                                  int remap_flags);

 /**
@ -193,7 +203,8 @@ void BKE_libblock_relink_multiple(Main *bmain,
 void BKE_libblock_relink_to_newid(Main *bmain, ID *id, int remap_flag) ATTR_NONNULL();

 using BKE_library_free_notifier_reference_cb = void (*)(const void *);
-using BKE_library_remap_editor_id_reference_cb = void (*)(const IDRemapper *mappings);
+using BKE_library_remap_editor_id_reference_cb =
+    void (*)(const blender::bke::id::IDRemapper &mappings);

 void BKE_library_callback_free_notifier_reference_set(BKE_library_free_notifier_reference_cb func);
 void BKE_library_callback_remap_editor_id_reference_set(
@ -220,7 +231,7 @@ enum IDRemapperApplyOptions {
   *
   * NOTE: Currently unused by main remapping code, since user-count is handled by
   * `foreach_libblock_remap_callback_apply` there, depending on whether the remapped pointer does
-   * use it or not. Need for rare cases in UI handling though (see e.g. `image_id_remap` in
+   * use it or not. Needed for rare cases in UI handling though (see e.g. `image_id_remap` in
   * `space_image.cc`).
   */
  ID_REMAP_APPLY_UPDATE_REFCOUNT = (1 << 0),
@ -233,9 +244,9 @@ enum IDRemapperApplyOptions {
  ID_REMAP_APPLY_ENSURE_REAL = (1 << 1),

  /**
-   * Unassign in stead of remap when the new ID data-block would become id_self.
+   * Unassign instead of remap when the new ID pointer would point to itself.
   *
-   * To use this option 'BKE_id_remapper_apply_ex' must be used with a not-null id_self parameter.
+   * To use this option #IDRemapper::apply must be used with a non-null id_self parameter.
   */
  ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF = (1 << 2),

@ -244,58 +255,66 @@ enum IDRemapperApplyOptions {
 ENUM_OPERATORS(IDRemapperApplyOptions, ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF)

 using IDRemapperIterFunction = void (*)(ID *old_id, ID *new_id, void *user_data);
+using IDTypeFilter = uint64_t;

-/**
- * Create a new ID Remapper.
- *
- * An ID remapper stores multiple remapping rules.
- */
-IDRemapper *BKE_id_remapper_create();
+namespace blender::bke::id {

-void BKE_id_remapper_clear(IDRemapper *id_remapper);
-bool BKE_id_remapper_is_empty(const IDRemapper *id_remapper);
-/** Free the given ID Remapper. */
-void BKE_id_remapper_free(IDRemapper *id_remapper);
-/** Add a new remapping. Does not replace an existing mapping for `old_id`, if any. */
-void BKE_id_remapper_add(IDRemapper *id_remapper, ID *old_id, ID *new_id);
-/** Add a new remapping, replacing a potential already existing mapping of `old_id`. */
-void BKE_id_remapper_add_overwrite(IDRemapper *id_remapper, ID *old_id, ID *new_id);
+class IDRemapper {
+  blender::Map<ID *, ID *> mappings_;
+  IDTypeFilter source_types_ = 0;

-/**
- * Apply a remapping.
- *
- * Update the id pointer stored in the given r_id_ptr if a remapping rule exists.
- */
-IDRemapperApplyResult BKE_id_remapper_apply(const IDRemapper *id_remapper,
-                                            ID **r_id_ptr,
-                                            IDRemapperApplyOptions options);
-/**
- * Apply a remapping.
- *
- * Use this function when `ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF`. In this case
- * the #id_self parameter is required. Otherwise the #BKE_id_remapper_apply can be used.
- *
- * \param id_self: required for ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF.
- *     When remapping to id_self it will then be remapped to NULL.
- */
-IDRemapperApplyResult BKE_id_remapper_apply_ex(const IDRemapper *id_remapper,
-                                               ID **r_id_ptr,
-                                               IDRemapperApplyOptions options,
-                                               ID *id_self);
-bool BKE_id_remapper_has_mapping_for(const IDRemapper *id_remapper, uint64_t type_filter);
+ public:
+  void clear(void)
+  {
+    mappings_.clear();
+    source_types_ = 0;
+  }

-/**
- * Determine the mapping result, without applying the mapping.
- */
-IDRemapperApplyResult BKE_id_remapper_get_mapping_result(const IDRemapper *id_remapper,
-                                                         ID *id,
-                                                         IDRemapperApplyOptions options,
-                                                         const ID *id_self);
-void BKE_id_remapper_iter(const IDRemapper *id_remapper,
-                          IDRemapperIterFunction func,
-                          void *user_data);
+  bool is_empty(void) const
+  {
+    return mappings_.is_empty();
+  }

-/** Returns a readable string for the given result. Can be used for debugging purposes. */
-const char *BKE_id_remapper_result_string(const IDRemapperApplyResult result);
-/** Prints out the rules inside the given id_remapper. Can be used for debugging purposes. */
-void BKE_id_remapper_print(const IDRemapper *id_remapper);
+  bool contains_mappings_for_any(IDTypeFilter filter) const
+  {
+    return (source_types_ & filter) != 0;
+  }
+
+  /** Add a new remapping. Does not replace an existing mapping for `old_id`, if any. */
+  void add(ID *old_id, ID *new_id);
+  /** Add a new remapping, replacing a potential already existing mapping of `old_id`. */
+  void add_overwrite(ID *old_id, ID *new_id);
+
+  /** Determine the mapping result, without applying the mapping. */
+  IDRemapperApplyResult get_mapping_result(ID *id,
+                                           IDRemapperApplyOptions options,
+                                           const ID *id_self) const;
+
+  /**
+   * Apply a remapping.
+   *
+   * Update the id pointer stored in the given r_id_ptr if a remapping rule exists.
+   *
+   * \param id_self: Only for ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF.
+   *     When remapping to `id_self` it will then be remapped to `nullptr` instead.
+   */
+  IDRemapperApplyResult apply(ID **r_id_ptr,
+                              IDRemapperApplyOptions options,
+                              ID *id_self = nullptr) const;
+
+  /** Iterate over all remapping pairs in the remapper, and call the callback function on them. */
+  void iter(IDRemapperIterFunction func, void *user_data) const
+  {
+    for (auto item : mappings_.items()) {
+      func(item.key, item.value, user_data);
+    }
+  }
+
+  /** Return a readable string for the given result. Can be used for debugging purposes. */
+  static const blender::StringRefNull result_to_string(const IDRemapperApplyResult result);
+
+  /** Print out the rules inside the given id_remapper. Can be used for debugging purposes. */
+  void print(void) const;
+};
+
+}  // namespace blender::bke::id
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@ -1366,6 +1366,13 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, i
 #define FN_NODE_ROTATE_VECTOR 1229
 #define FN_NODE_ROTATE_ROTATION 1230
 #define FN_NODE_INVERT_ROTATION 1231
+#define FN_NODE_TRANSFORM_POINT 1232
+#define FN_NODE_TRANSFORM_DIRECTION 1233
+#define FN_NODE_MATRIX_MULTIPLY 1234
+#define FN_NODE_COMBINE_TRANSFORM 1235
+#define FN_NODE_SEPARATE_TRANSFORM 1236
+#define FN_NODE_INVERT_MATRIX 1237
+#define FN_NODE_TRANSPOSE_MATRIX 1238

 /** \} */

--- a/source/blender/blenkernel/BKE_node_tree_interface.hh
+++ b/source/blender/blenkernel/BKE_node_tree_interface.hh
@ -130,6 +130,7 @@ static const bNodeSocketStaticTypeInfo node_socket_subtypes[] = {
    {"NodeSocketIntFactor", "NodeTreeInterfaceSocketIntFactor", SOCK_INT, PROP_FACTOR},
    {"NodeSocketBool", "NodeTreeInterfaceSocketBool", SOCK_BOOLEAN, PROP_NONE},
    {"NodeSocketRotation", "NodeTreeInterfaceSocketRotation", SOCK_ROTATION, PROP_NONE},
+    {"NodeSocketMatrix", "NodeTreeInterfaceSocketMatrix", SOCK_MATRIX, PROP_NONE},
    {"NodeSocketVector", "NodeTreeInterfaceSocketVector", SOCK_VECTOR, PROP_NONE},
    {"NodeSocketVectorTranslation",
     "NodeTreeInterfaceSocketVectorTranslation",
@ -206,6 +207,7 @@ template<typename Fn> bool socket_data_to_static_type(const eNodeSocketDatatype

    case SOCK_CUSTOM:
    case SOCK_SHADER:
+    case SOCK_MATRIX:
    case SOCK_GEOMETRY:
      return true;
  }
--- a/source/blender/blenkernel/BKE_object.hh
+++ b/source/blender/blenkernel/BKE_object.hh
@ -319,7 +319,7 @@ blender::Vector<Base *> BKE_object_pose_base_array_get(const Scene *scene,
 void BKE_object_get_parent_matrix(Object *ob, Object *par, float r_parentmat[4][4]);

 /**
- * Compute object world transform and store it in `ob->object_to_world`.
+ * Compute object world transform and store it in `ob->object_to_world().ptr()`.
 */
 void BKE_object_where_is_calc(Depsgraph *depsgraph, Scene *scene, Object *ob);
 void BKE_object_where_is_calc_ex(
--- a/source/blender/blenkernel/BKE_object_types.hh
+++ b/source/blender/blenkernel/BKE_object_types.hh
@ -26,6 +26,9 @@ namespace blender::bke {
 struct GeometrySet;

 struct ObjectRuntime {
+  /** Final transformation matrices with constraints & animsys applied. */
+  float4x4 object_to_world;
+  float4x4 world_to_object;
  /**
   * The custom data layer mask that was last used
   * to calculate data_eval and mesh_deform_eval.
--- a/source/blender/blenkernel/BKE_screen.hh
+++ b/source/blender/blenkernel/BKE_screen.hh
@ -17,6 +17,10 @@

 #include "BKE_context.hh"

+namespace blender::bke::id {
+class IDRemapper;
+}
+
 namespace blender::asset_system {
 class AssetRepresentation;
 }
@ -28,7 +32,6 @@ struct BlendLibReader;
 struct BlendWriter;
 struct Header;
 struct ID;
-struct IDRemapper;
 struct LayoutPanelState;
 struct LibraryForeachIDData;
 struct ListBase;
@ -109,7 +112,7 @@ struct SpaceType {
  bContextDataCallback context;

  /* Used when we want to replace an ID by another (or NULL). */
-  void (*id_remap)(ScrArea *area, SpaceLink *sl, const IDRemapper *mappings);
+  void (*id_remap)(ScrArea *area, SpaceLink *sl, const blender::bke::id::IDRemapper &mappings);

  /**
   * foreach_id callback to process all ID pointers of the editor. Used indirectly by lib_query's
--- a/source/blender/blenkernel/BKE_viewer_path.hh
+++ b/source/blender/blenkernel/BKE_viewer_path.hh
@ -29,7 +29,10 @@ struct BlendDataReader;
 struct BlendLibReader;
 struct LibraryForeachIDData;
 struct Library;
-struct IDRemapper;
+
+namespace blender::bke::id {
+class IDRemapper;
+}

 enum ViewerPathEqualFlag {
  VIEWER_PATH_EQUAL_FLAG_IGNORE_REPEAT_ITERATION = (1 << 0),
@ -44,7 +47,8 @@ bool BKE_viewer_path_equal(const ViewerPath *a,
 void BKE_viewer_path_blend_write(BlendWriter *writer, const ViewerPath *viewer_path);
 void BKE_viewer_path_blend_read_data(BlendDataReader *reader, ViewerPath *viewer_path);
 void BKE_viewer_path_foreach_id(LibraryForeachIDData *data, ViewerPath *viewer_path);
-void BKE_viewer_path_id_remap(ViewerPath *viewer_path, const IDRemapper *mappings);
+void BKE_viewer_path_id_remap(ViewerPath *viewer_path,
+                              const blender::bke::id::IDRemapper &mappings);

 ViewerPathElem *BKE_viewer_path_elem_new(ViewerPathElemType type);
 IDViewerPathElem *BKE_viewer_path_elem_new_id();
--- a/source/blender/blenkernel/BKE_wm_runtime.hh
+++ b/source/blender/blenkernel/BKE_wm_runtime.hh
@ -0,0 +1,15 @@
+/* SPDX-FileCopyrightText: 2024 Blender Authors
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+namespace blender::bke {
+
+class WindowManagerRuntime {
+ public:
+  /** Indicates whether interface is locked for user interaction. */
+  bool is_interface_locked = false;
+};
+
+}  // namespace blender::bke
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@ -381,7 +381,7 @@ set(SRC
  BKE_data_transfer.h
  BKE_deform.hh
  BKE_displist.h
-  BKE_duplilist.h
+  BKE_duplilist.hh
  BKE_dynamicpaint.h
  BKE_editlattice.h
  BKE_editmesh.hh
@ -522,6 +522,7 @@ set(SRC
  BKE_volume_openvdb.hh
  BKE_volume_render.hh
  BKE_volume_to_mesh.hh
+  BKE_wm_runtime.hh
  BKE_workspace.h
  BKE_world.h
  BKE_writeavi.h
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@ -1711,7 +1711,7 @@ void what_does_obaction(Object *ob,
  workob->runtime = &workob_runtime;

  /* init workob */
-  copy_m4_m4(workob->object_to_world, ob->object_to_world);
+  copy_m4_m4(workob->runtime->object_to_world.ptr(), ob->object_to_world().ptr());
  copy_m4_m4(workob->parentinv, ob->parentinv);
  copy_m4_m4(workob->constinv, ob->constinv);
  workob->parent = ob->parent;
--- a/source/blender/blenkernel/intern/anim_visualization.cc
+++ b/source/blender/blenkernel/intern/anim_visualization.cc
@ -8,9 +8,7 @@
 #include "MEM_guardedalloc.h"

 #include "DNA_action_types.h"
-#include "DNA_anim_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"

 #include "BLT_translation.hh"

--- a/source/blender/blenkernel/intern/armature.cc
+++ b/source/blender/blenkernel/intern/armature.cc
@ -1992,7 +1992,7 @@ void BKE_armature_mat_world_to_pose(Object *ob, const float inmat[4][4], float o
  }

  /* Get inverse of (armature) object's matrix. */
-  invert_m4_m4(obmat, ob->object_to_world);
+  invert_m4_m4(obmat, ob->object_to_world().ptr());

  /* multiply given matrix by object's-inverse to find pose-space matrix */
  mul_m4_m4m4(outmat, inmat, obmat);
@ -2967,7 +2967,7 @@ void BKE_pose_where_is(Depsgraph *depsgraph, Scene *scene, Object *ob)
    }
  }
  else {
-    invert_m4_m4(ob->world_to_object, ob->object_to_world); /* world_to_object is needed */
+    invert_m4_m4(ob->runtime->world_to_object.ptr(), ob->object_to_world().ptr());

    /* 1. clear flags */
    LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
@ -3068,16 +3068,16 @@ void BKE_pchan_minmax(const Object *ob,
                 pchan->custom_translation[0],
                 pchan->custom_translation[1],
                 pchan->custom_translation[2]);
-    mul_m4_series(mat, ob->object_to_world, tmp, rmat, smat);
+    mul_m4_series(mat, ob->object_to_world().ptr(), tmp, rmat, smat);
    BoundBox bb;
    BKE_boundbox_init_from_minmax(&bb, bb_custom->min, bb_custom->max);
    BKE_boundbox_minmax(&bb, mat, r_min, r_max);
  }
  else {
    float vec[3];
-    mul_v3_m4v3(vec, ob->object_to_world, pchan_tx->pose_head);
+    mul_v3_m4v3(vec, ob->object_to_world().ptr(), pchan_tx->pose_head);
    minmax_v3v3_v3(r_min, r_max, vec);
-    mul_v3_m4v3(vec, ob->object_to_world, pchan_tx->pose_tail);
+    mul_v3_m4v3(vec, ob->object_to_world().ptr(), pchan_tx->pose_tail);
    minmax_v3v3_v3(r_min, r_max, vec);
  }
 }
--- a/source/blender/blenkernel/intern/armature_deform.cc
+++ b/source/blender/blenkernel/intern/armature_deform.cc
@ -600,9 +600,9 @@ static void armature_deform_coords_impl(const Object *ob_arm,
  data.bmesh.cd_dvert_offset = cd_dvert_offset;

  float obinv[4][4];
-  invert_m4_m4(obinv, ob_target->object_to_world);
+  invert_m4_m4(obinv, ob_target->object_to_world().ptr());

-  mul_m4_m4m4(data.postmat, obinv, ob_arm->object_to_world);
+  mul_m4_m4m4(data.postmat, obinv, ob_arm->object_to_world().ptr());
  invert_m4_m4(data.premat, data.postmat);

  if (em_target != nullptr) {
--- a/source/blender/blenkernel/intern/armature_update.cc
+++ b/source/blender/blenkernel/intern/armature_update.cc
@ -19,15 +19,12 @@
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"

 #include "BKE_action.h"
 #include "BKE_anim_path.h"
 #include "BKE_armature.hh"
 #include "BKE_curve.hh"
-#include "BKE_displist.h"
 #include "BKE_fcurve.h"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_scene.hh"

@ -257,11 +254,11 @@ static void apply_curve_transform(
   * unless the option to allow curve to be positioned elsewhere is activated (i.e. no root).
   */
  if ((ik_data->flag & CONSTRAINT_SPLINEIK_NO_ROOT) == 0) {
-    mul_m4_v3(ik_data->tar->object_to_world, r_vec);
+    mul_m4_v3(ik_data->tar->object_to_world().ptr(), r_vec);
  }

  /* Convert the position to pose-space. */
-  mul_m4_v3(ob->world_to_object, r_vec);
+  mul_m4_v3(ob->world_to_object().ptr(), r_vec);

  /* Set the new radius (it should be the average value). */
  *r_radius = (radius + *r_radius) / 2;
@ -832,7 +829,7 @@ void BKE_pose_eval_init(Depsgraph *depsgraph, Scene * /*scene*/, Object *object)
  BLI_assert((object->pose->flag & POSE_RECALC) == 0);

  /* world_to_object is needed for solvers. */
-  invert_m4_m4(object->world_to_object, object->object_to_world);
+  invert_m4_m4(object->runtime->world_to_object.ptr(), object->object_to_world().ptr());

  /* clear flags */
  for (bPoseChannel *pchan = static_cast<bPoseChannel *>(pose->chanbase.first); pchan != nullptr;
--- a/source/blender/blenkernel/intern/attribute_access.cc
+++ b/source/blender/blenkernel/intern/attribute_access.cc
@ -50,6 +50,8 @@ const blender::CPPType *custom_data_type_to_cpp_type(const eCustomDataType type)
      return &CPPType::get<ColorGeometry4b>();
    case CD_PROP_QUATERNION:
      return &CPPType::get<math::Quaternion>();
+    case CD_PROP_FLOAT4X4:
+      return &CPPType::get<float4x4>();
    case CD_PROP_STRING:
      return &CPPType::get<MStringProperty>();
    default:
@ -89,6 +91,9 @@ eCustomDataType cpp_type_to_custom_data_type(const blender::CPPType &type)
  if (type.is<math::Quaternion>()) {
    return CD_PROP_QUATERNION;
  }
+  if (type.is<float4x4>()) {
+    return CD_PROP_FLOAT4X4;
+  }
  if (type.is<MStringProperty>()) {
    return CD_PROP_STRING;
  }
@ -167,6 +172,8 @@ static int attribute_data_type_complexity(const eCustomDataType data_type)
      return 8;
    case CD_PROP_COLOR:
      return 9;
+    case CD_PROP_FLOAT4X4:
+      return 10;
 #if 0 /* These attribute types are not supported yet. */
    case CD_PROP_STRING:
      return 10;
--- a/source/blender/blenkernel/intern/attribute_math.cc
+++ b/source/blender/blenkernel/intern/attribute_math.cc
@ -3,6 +3,7 @@
 * SPDX-License-Identifier: GPL-2.0-or-later */

 #include "BLI_array_utils.hh"
+#include "BLI_math_matrix.hh"
 #include "BLI_math_quaternion.hh"

 #include "BKE_attribute_math.hh"
@ -36,6 +37,40 @@ math::Quaternion mix4(const float4 &weights,
  return math::Quaternion::expmap(expmap_mixed);
 }

+template<> float4x4 mix2(const float factor, const float4x4 &a, const float4x4 &b)
+{
+  return math::interpolate(a, b, factor);
+}
+
+template<>
+float4x4 mix3(const float3 &weights, const float4x4 &v0, const float4x4 &v1, const float4x4 &v2)
+{
+  const float3 location = mix3(weights, v0.location(), v1.location(), v2.location());
+  const math::Quaternion rotation = mix3(
+      weights, math::to_quaternion(v0), math::to_quaternion(v1), math::to_quaternion(v2));
+  const float3 scale = mix3(weights, math::to_scale(v0), math::to_scale(v1), math::to_scale(v2));
+  return math::from_loc_rot_scale<float4x4>(location, rotation, scale);
+}
+
+template<>
+float4x4 mix4(const float4 &weights,
+              const float4x4 &v0,
+              const float4x4 &v1,
+              const float4x4 &v2,
+              const float4x4 &v3)
+{
+  const float3 location = mix4(
+      weights, v0.location(), v1.location(), v2.location(), v3.location());
+  const math::Quaternion rotation = mix4(weights,
+                                         math::to_quaternion(v0),
+                                         math::to_quaternion(v1),
+                                         math::to_quaternion(v2),
+                                         math::to_quaternion(v3));
+  const float3 scale = mix4(
+      weights, math::to_scale(v0), math::to_scale(v1), math::to_scale(v2), math::to_scale(v3));
+  return math::from_loc_rot_scale<float4x4>(location, rotation, scale);
+}
+
 ColorGeometry4fMixer::ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> buffer,
                                           ColorGeometry4f default_color)
    : ColorGeometry4fMixer(buffer, buffer.index_range(), default_color)
@ -160,6 +195,58 @@ void ColorGeometry4bMixer::finalize(const IndexMask &mask)
  });
 }

+float4x4Mixer::float4x4Mixer(MutableSpan<float4x4> buffer)
+    : float4x4Mixer(buffer, buffer.index_range())
+{
+}
+
+float4x4Mixer::float4x4Mixer(MutableSpan<float4x4> buffer, const IndexMask & /*mask*/)
+    : buffer_(buffer),
+      total_weights_(buffer.size(), 0.0f),
+      location_buffer_(buffer.size(), float3(0)),
+      expmap_buffer_(buffer.size(), float3(0)),
+      scale_buffer_(buffer.size(), float3(0))
+{
+}
+
+void float4x4Mixer::float4x4Mixer::set(int64_t index, const float4x4 &value, const float weight)
+{
+  location_buffer_[index] = value.location() * weight;
+  expmap_buffer_[index] = math::to_quaternion(value).expmap() * weight;
+  scale_buffer_[index] = math::to_scale(value) * weight;
+  total_weights_[index] = weight;
+}
+
+void float4x4Mixer::mix_in(int64_t index, const float4x4 &value, float weight)
+{
+  location_buffer_[index] += value.location() * weight;
+  expmap_buffer_[index] += math::to_quaternion(value).expmap() * weight;
+  scale_buffer_[index] += math::to_scale(value) * weight;
+  total_weights_[index] += weight;
+}
+
+void float4x4Mixer::finalize()
+{
+  this->finalize(buffer_.index_range());
+}
+
+void float4x4Mixer::finalize(const IndexMask &mask)
+{
+  mask.foreach_index([&](const int64_t i) {
+    const float weight = total_weights_[i];
+    if (weight > 0.0f) {
+      const float weight_inv = math::rcp(weight);
+      buffer_[i] = math::from_loc_rot_scale<float4x4>(
+          location_buffer_[i] * weight_inv,
+          math::Quaternion::expmap(expmap_buffer_[i] * weight_inv),
+          scale_buffer_[i] * weight_inv);
+    }
+    else {
+      buffer_[i] = float4x4::identity();
+    }
+  });
+}
+
 void gather(const GSpan src, const Span<int> map, GMutableSpan dst)
 {
  attribute_math::convert_to_static_type(src.type(), [&](auto dummy) {
--- a/source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
+++ b/source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
@ -6,19 +6,15 @@

 #include "BKE_bake_geometry_nodes_modifier.hh"
 #include "BKE_collection.hh"
-#include "BKE_curves.hh"
 #include "BKE_main.hh"

 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
-#include "DNA_pointcloud_types.h"

 #include "BLI_binary_search.hh"
 #include "BLI_fileops.hh"
-#include "BLI_hash_md5.hh"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_string_utils.hh"

 #include "MOD_nodes.hh"

--- a/source/blender/blenkernel/intern/bake_items.cc
+++ b/source/blender/blenkernel/intern/bake_items.cc
@ -6,22 +6,15 @@
 #include "BKE_bake_items_serialize.hh"
 #include "BKE_curves.hh"
 #include "BKE_instances.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_pointcloud.hh"
 #include "BKE_volume.hh"

-#include "BLI_endian_defines.h"
-#include "BLI_endian_switch.h"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_path_util.h"

 #include "DNA_material_types.h"
 #include "DNA_volume_types.h"

-#include "RNA_access.hh"
-#include "RNA_enum_types.hh"
-
 namespace blender::bke::bake {

 using namespace io::serialize;
--- a/source/blender/blenkernel/intern/bake_items_serialize.cc
+++ b/source/blender/blenkernel/intern/bake_items_serialize.cc
@ -1042,6 +1042,10 @@ static std::shared_ptr<io::serialize::Value> serialize_primitive_value(
      const math::Quaternion value = *static_cast<const math::Quaternion *>(value_ptr);
      return serialize_float_array({&value.x, 4});
    }
+    case CD_PROP_FLOAT4X4: {
+      const float4x4 value = *static_cast<const float4x4 *>(value_ptr);
+      return serialize_float_array({value.base_ptr(), value.col_len * value.row_len});
+    }
    default:
      break;
  }
@ -1160,6 +1164,9 @@ template<typename T>
    case CD_PROP_QUATERNION: {
      return deserialize_float_array(io_value, {static_cast<float *>(r_value), 4});
    }
+    case CD_PROP_FLOAT4X4: {
+      return deserialize_float_array(io_value, {static_cast<float *>(r_value), 4 * 4});
+    }
    default:
      break;
  }
--- a/source/blender/blenkernel/intern/bake_items_socket.cc
+++ b/source/blender/blenkernel/intern/bake_items_socket.cc
@ -47,6 +47,7 @@ Array<std::unique_ptr<BakeItem>> move_socket_values_to_bake_items(const Span<voi
      case SOCK_INT:
      case SOCK_BOOLEAN:
      case SOCK_ROTATION:
+      case SOCK_MATRIX:
      case SOCK_RGBA: {
        auto &value_variant = *static_cast<SocketValueVariant *>(socket_value);
        if (value_variant.is_context_dependent_field()) {
@ -131,6 +132,7 @@ Array<std::unique_ptr<BakeItem>> move_socket_values_to_bake_items(const Span<voi
    case SOCK_INT:
    case SOCK_BOOLEAN:
    case SOCK_ROTATION:
+    case SOCK_MATRIX:
    case SOCK_RGBA: {
      const CPPType &base_type = *socket_type_to_geo_nodes_base_cpp_type(socket_type);
      if (const auto *item = dynamic_cast<const PrimitiveBakeItem *>(&bake_item)) {
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@ -25,29 +25,22 @@
 #include "BKE_blender.hh"           /* own include */
 #include "BKE_blender_user_menu.hh" /* own include */
 #include "BKE_blender_version.h"    /* own include */
-#include "BKE_blendfile.hh"
 #include "BKE_brush.hh"
 #include "BKE_cachefile.hh"
 #include "BKE_callbacks.hh"
 #include "BKE_global.hh"
 #include "BKE_idprop.h"
-#include "BKE_image.h"
-#include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_node.h"
 #include "BKE_preferences.h"
 #include "BKE_report.hh"
-#include "BKE_scene.hh"
 #include "BKE_screen.hh"
 #include "BKE_studiolight.h"

 #include "DEG_depsgraph.hh"

-#include "RE_pipeline.h"
 #include "RE_texture.h"

-#include "SEQ_sequencer.hh"
-
 #include "BLF_api.hh"

 Global G;
--- a/source/blender/blenkernel/intern/blender_copybuffer.cc
+++ b/source/blender/blenkernel/intern/blender_copybuffer.cc
@ -12,29 +12,17 @@

 #include "MEM_guardedalloc.h"

-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_windowmanager_types.h"

-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"

-#include "IMB_imbuf.hh"
-#include "IMB_moviecache.hh"
-
 #include "BKE_blender_copybuffer.hh" /* own include */
 #include "BKE_blendfile.hh"
 #include "BKE_blendfile_link_append.hh"
 #include "BKE_context.hh"
-#include "BKE_global.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_main.hh"
-#include "BKE_scene.hh"

-#include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"

 #include "BLO_readfile.hh"
--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@ -38,9 +38,6 @@
 #include "BKE_colorband.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_idtype.hh"
-#include "BKE_ipo.h"
-#include "BKE_keyconfig.h"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_override.hh"
@ -61,14 +58,14 @@
 #include "BLO_userdef_default.h"
 #include "BLO_writefile.hh"

-#include "RNA_access.hh"
-
 #include "RE_pipeline.h"

 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
 #endif

+using namespace blender::bke;
+
 /* -------------------------------------------------------------------- */
 /** \name Blend/Library Paths
 * \{ */
@ -233,7 +230,7 @@ struct ReuseOldBMainData {

  /** Storage for all remapping rules (old_id -> new_id) required by the preservation of old IDs
   * into the new Main. */
-  IDRemapper *remapper;
+  id::IDRemapper *remapper;
  bool is_libraries_remapped;

  /** Used to find matching IDs by name/lib in new main, to remap ID usages of data ported over
@ -251,25 +248,25 @@ struct ReuseOldBMainData {
 * double of a linked data as a local one, without any known relationships between them. In
 * practice, this latter case is not expected to commonly happen.
 */
-static IDRemapper *reuse_bmain_data_remapper_ensure(ReuseOldBMainData *reuse_data)
+static id::IDRemapper &reuse_bmain_data_remapper_ensure(ReuseOldBMainData *reuse_data)
 {
  if (reuse_data->is_libraries_remapped) {
-    return reuse_data->remapper;
+    return *reuse_data->remapper;
  }

  if (reuse_data->remapper == nullptr) {
-    reuse_data->remapper = BKE_id_remapper_create();
+    reuse_data->remapper = MEM_new<id::IDRemapper>(__func__);
  }

  Main *new_bmain = reuse_data->new_bmain;
  Main *old_bmain = reuse_data->old_bmain;
-  IDRemapper *remapper = reuse_data->remapper;
+  id::IDRemapper &remapper = *reuse_data->remapper;

  LISTBASE_FOREACH (Library *, old_lib_iter, &old_bmain->libraries) {
    /* In case newly opened `new_bmain` is a library of the `old_bmain`, remap it to null, since a
     * file should never ever have linked data from itself. */
    if (STREQ(old_lib_iter->filepath_abs, new_bmain->filepath)) {
-      BKE_id_remapper_add(remapper, &old_lib_iter->id, nullptr);
+      remapper.add(&old_lib_iter->id, nullptr);
      continue;
    }

@ -282,19 +279,18 @@ static IDRemapper *reuse_bmain_data_remapper_ensure(ReuseOldBMainData *reuse_dat
        continue;
      }

-      BKE_id_remapper_add(remapper, &old_lib_iter->id, &new_lib_iter->id);
+      remapper.add(&old_lib_iter->id, &new_lib_iter->id);
      break;
    }
  }

  reuse_data->is_libraries_remapped = true;
-  return reuse_data->remapper;
+  return *reuse_data->remapper;
 }

-static bool reuse_bmain_data_remapper_is_id_remapped(IDRemapper *remapper, ID *id)
+static bool reuse_bmain_data_remapper_is_id_remapped(id::IDRemapper &remapper, ID *id)
 {
-  IDRemapperApplyResult result = BKE_id_remapper_get_mapping_result(
-      remapper, id, ID_REMAP_APPLY_DEFAULT, nullptr);
+  IDRemapperApplyResult result = remapper.get_mapping_result(id, ID_REMAP_APPLY_DEFAULT, nullptr);
  if (ELEM(result, ID_REMAP_RESULT_SOURCE_REMAPPED, ID_REMAP_RESULT_SOURCE_UNASSIGNED)) {
    /* ID is already remapped to its matching ID in the new main, or explicitly remapped to null,
     * nothing else to do here. */
@ -507,7 +503,7 @@ static void swap_old_bmain_data_for_blendfile(ReuseOldBMainData *reuse_data, con
  ListBase *new_lb = which_libbase(new_bmain, id_code);
  ListBase *old_lb = which_libbase(old_bmain, id_code);

-  IDRemapper *remapper = reuse_bmain_data_remapper_ensure(reuse_data);
+  id::IDRemapper &remapper = reuse_bmain_data_remapper_ensure(reuse_data);

  /* NOTE: Full swapping is only supported for ID types that are assumed to be only local
   * data-blocks (like UI-like ones). Otherwise, the swapping could fail in many funny ways. */
@ -534,14 +530,14 @@ static void swap_old_bmain_data_for_blendfile(ReuseOldBMainData *reuse_data, con
    const int strcmp_result = strcmp(discarded_id_iter->name + 2, reused_id_iter->name + 2);
    if (strcmp_result == 0) {
      /* Matching IDs, we can remap the discarded 'new' one to the re-used 'old' one. */
-      BKE_id_remapper_add(remapper, discarded_id_iter, reused_id_iter);
+      remapper.add(discarded_id_iter, reused_id_iter);

      discarded_id_iter = static_cast<ID *>(discarded_id_iter->next);
      reused_id_iter = static_cast<ID *>(reused_id_iter->next);
    }
    else if (strcmp_result < 0) {
      /* No matching reused 'old' ID for this discarded 'new' one. */
-      BKE_id_remapper_add(remapper, discarded_id_iter, nullptr);
+      remapper.add(discarded_id_iter, nullptr);

      discarded_id_iter = static_cast<ID *>(discarded_id_iter->next);
    }
@ -553,7 +549,7 @@ static void swap_old_bmain_data_for_blendfile(ReuseOldBMainData *reuse_data, con
  for (; discarded_id_iter != nullptr;
       discarded_id_iter = static_cast<ID *>(discarded_id_iter->next))
  {
-    BKE_id_remapper_add(remapper, discarded_id_iter, nullptr);
+    remapper.add(discarded_id_iter, nullptr);
  }

  FOREACH_MAIN_LISTBASE_ID_BEGIN (new_lb, reused_id_iter) {
@ -562,7 +558,7 @@ static void swap_old_bmain_data_for_blendfile(ReuseOldBMainData *reuse_data, con

    /* Ensure that the reused ID is remapped to itself, since it is known to be in the `new_bmain`.
     */
-    BKE_id_remapper_add_overwrite(remapper, reused_id_iter, reused_id_iter);
+    remapper.add_overwrite(reused_id_iter, reused_id_iter);
  }
  FOREACH_MAIN_LISTBASE_ID_END;
 }
@ -616,8 +612,8 @@ static void swap_wm_data_for_blendfile(ReuseOldBMainData *reuse_data, const bool
     * new WM, and is responsible to free it properly. */
    reuse_data->wm_setup_data->old_wm = old_wm;

-    IDRemapper *remapper = reuse_bmain_data_remapper_ensure(reuse_data);
-    BKE_id_remapper_add(remapper, &old_wm->id, &new_wm->id);
+    id::IDRemapper &remapper = reuse_bmain_data_remapper_ensure(reuse_data);
+    remapper.add(&old_wm->id, &new_wm->id);
  }
  /* Current (old) WM, but no (new) one in file (should only happen when reading pre 2.5 files, no
   * WM back then), or not loading UI: Keep current WM. */
@ -640,7 +636,7 @@ static int swap_old_bmain_data_for_blendfile_dependencies_process_cb(
  ReuseOldBMainData *reuse_data = static_cast<ReuseOldBMainData *>(cb_data->user_data);

  /* First check if it has already been remapped. */
-  IDRemapper *remapper = reuse_bmain_data_remapper_ensure(reuse_data);
+  id::IDRemapper &remapper = reuse_bmain_data_remapper_ensure(reuse_data);
  if (reuse_bmain_data_remapper_is_id_remapped(remapper, id)) {
    return IDWALK_RET_NOP;
  }
@ -649,7 +645,7 @@ static int swap_old_bmain_data_for_blendfile_dependencies_process_cb(
  BLI_assert(id_map != nullptr);

  ID *id_new = BKE_main_idmap_lookup_id(id_map, id);
-  BKE_id_remapper_add(remapper, id, id_new);
+  remapper.add(id, id_new);

  return IDWALK_RET_NOP;
 }
@ -981,7 +977,7 @@ static void setup_app_data(bContext *C,

    /* Handle all pending remapping from swapping old and new IDs around. */
    BKE_libblock_remap_multiple_raw(bfd->main,
-                                    reuse_data.remapper,
+                                    *reuse_data.remapper,
                                    (ID_REMAP_FORCE_UI_POINTERS | ID_REMAP_SKIP_USER_REFCOUNT |
                                     ID_REMAP_SKIP_UPDATE_TAGGING | ID_REMAP_SKIP_USER_CLEAR));

@ -990,7 +986,7 @@ static void setup_app_data(bContext *C,
     * library of the previous opened blendfile'. */
    reuse_bmain_data_invalid_local_usages_fix(&reuse_data);

-    BKE_id_remapper_free(reuse_data.remapper);
+    MEM_delete(reuse_data.remapper);
    reuse_data.remapper = nullptr;

    wm_data_consistency_ensure(CTX_wm_manager(C), curscene, cur_view_layer);
--- a/source/blender/blenkernel/intern/boids.cc
+++ b/source/blender/blenkernel/intern/boids.cc
@ -962,7 +962,7 @@ void boids_precalc_rules(ParticleSettings *part, float cfra)
        if (flbr->ob && flbr->cfra != cfra) {
          /* save object locations for velocity calculations */
          copy_v3_v3(flbr->oloc, flbr->loc);
-          copy_v3_v3(flbr->loc, flbr->ob->object_to_world[3]);
+          copy_v3_v3(flbr->loc, flbr->ob->object_to_world().location());
          flbr->cfra = cfra;
        }
      }
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@ -72,7 +72,7 @@
 #include "SEQ_iterator.hh"

 #ifndef _MSC_VER
-#  include "BLI_strict_flags.h"
+#  include "BLI_strict_flags.h" /* Keep last. */
 #endif

 static CLG_LogRef LOG = {"bke.bpath"};
--- a/source/blender/blenkernel/intern/brush.cc
+++ b/source/blender/blenkernel/intern/brush.cc
@ -12,9 +12,7 @@

 #include "DNA_brush_types.h"
 #include "DNA_defaults.h"
-#include "DNA_gpencil_legacy_types.h"
 #include "DNA_material_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"

@ -31,7 +29,6 @@
 #include "BKE_bpath.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.hh"
-#include "BKE_context.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_idprop.hh"
 #include "BKE_idtype.hh"
--- a/source/blender/blenkernel/intern/cachefile.cc
+++ b/source/blender/blenkernel/intern/cachefile.cc
@ -8,9 +8,7 @@

 #include <cstring>

-#include "DNA_anim_types.h"
 #include "DNA_cachefile_types.h"
-#include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

@ -24,13 +22,11 @@

 #include "BLT_translation.hh"

-#include "BKE_anim_data.h"
 #include "BKE_bpath.hh"
 #include "BKE_cachefile.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
-#include "BKE_modifier.hh"
 #include "BKE_scene.hh"

 #include "DEG_depsgraph_query.hh"
--- a/source/blender/blenkernel/intern/callbacks.cc
+++ b/source/blender/blenkernel/intern/callbacks.cc
@ -15,7 +15,6 @@

 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
-#include "RNA_types.hh"

 static ListBase callback_slots[BKE_CB_EVT_TOT] = {{nullptr}};

--- a/source/blender/blenkernel/intern/camera.cc
+++ b/source/blender/blenkernel/intern/camera.cc
@ -29,14 +29,11 @@
 #include "BLI_utildefines.h"

 #include "BKE_action.h"
-#include "BKE_anim_data.h"
 #include "BKE_camera.h"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
-#include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
 #include "BKE_object.hh"
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"
@ -281,16 +278,18 @@ float BKE_camera_object_dof_distance(const Object *ob)
  }
  if (cam->dof.focus_object) {
    float view_dir[3], dof_dir[3];
-    normalize_v3_v3(view_dir, ob->object_to_world[2]);
+    normalize_v3_v3(view_dir, ob->object_to_world().ptr()[2]);
    bPoseChannel *pchan = BKE_pose_channel_find_name(cam->dof.focus_object->pose,
                                                     cam->dof.focus_subtarget);
    if (pchan) {
      float posemat[4][4];
-      mul_m4_m4m4(posemat, cam->dof.focus_object->object_to_world, pchan->pose_mat);
-      sub_v3_v3v3(dof_dir, ob->object_to_world[3], posemat[3]);
+      mul_m4_m4m4(posemat, cam->dof.focus_object->object_to_world().ptr(), pchan->pose_mat);
+      sub_v3_v3v3(dof_dir, ob->object_to_world().location(), posemat[3]);
    }
    else {
-      sub_v3_v3v3(dof_dir, ob->object_to_world[3], cam->dof.focus_object->object_to_world[3]);
+      sub_v3_v3v3(dof_dir,
+                  ob->object_to_world().location(),
+                  cam->dof.focus_object->object_to_world().location());
    }
    return fabsf(dot_v3v3(view_dir, dof_dir));
  }
@ -685,7 +684,7 @@ static void camera_frame_fit_data_init(const Scene *scene,
  BKE_camera_params_compute_matrix(params);

  /* initialize callback data */
-  copy_m3_m4(data->camera_rotmat, (float(*)[4])ob->object_to_world);
+  copy_m3_m4(data->camera_rotmat, (float(*)[4])ob->object_to_world().ptr());
  normalize_m3(data->camera_rotmat);
  /* To transform a plane which is in its homogeneous representation (4d vector),
   * we need the inverse of the transpose of the transform matrix... */
@ -887,7 +886,7 @@ bool BKE_camera_view_frame_fit_to_coords(const Depsgraph *depsgraph,

 static void camera_model_matrix(const Object *camera, float r_modelmat[4][4])
 {
-  copy_m4_m4(r_modelmat, camera->object_to_world);
+  copy_m4_m4(r_modelmat, camera->object_to_world().ptr());
 }

 static void camera_stereo3d_model_matrix(const Object *camera,
@ -913,7 +912,7 @@ static void camera_stereo3d_model_matrix(const Object *camera,
  }

  float size[3];
-  mat4_to_size(size, camera->object_to_world);
+  mat4_to_size(size, camera->object_to_world().ptr());
  size_to_mat4(sizemat, size);

  if (pivot == CAM_S3D_PIVOT_CENTER) {
@ -953,7 +952,7 @@ static void camera_stereo3d_model_matrix(const Object *camera,
      toeinmat[3][0] = interocular_distance * fac_signed;

      /* transform */
-      normalize_m4_m4(r_modelmat, camera->object_to_world);
+      normalize_m4_m4(r_modelmat, camera->object_to_world().ptr());
      mul_m4_m4m4(r_modelmat, r_modelmat, toeinmat);

      /* scale back to the original size */
@ -961,7 +960,7 @@ static void camera_stereo3d_model_matrix(const Object *camera,
    }
    else { /* CAM_S3D_PIVOT_LEFT, CAM_S3D_PIVOT_RIGHT */
      /* rotate perpendicular to the interocular line */
-      normalize_m4_m4(r_modelmat, camera->object_to_world);
+      normalize_m4_m4(r_modelmat, camera->object_to_world().ptr());
      mul_m4_m4m4(r_modelmat, r_modelmat, rotmat);

      /* translate along the interocular line */
@ -977,7 +976,7 @@ static void camera_stereo3d_model_matrix(const Object *camera,
    }
  }
  else {
-    normalize_m4_m4(r_modelmat, camera->object_to_world);
+    normalize_m4_m4(r_modelmat, camera->object_to_world().ptr());

    /* translate - no rotation in CAM_S3D_OFFAXIS, CAM_S3D_PARALLEL */
    translate_m4(r_modelmat, -interocular_distance * fac_signed, 0.0f, 0.0f);
--- a/source/blender/blenkernel/intern/cdderivedmesh.cc
+++ b/source/blender/blenkernel/intern/cdderivedmesh.cc
@ -12,23 +12,16 @@
 #include <cmath>
 #include <cstring>

-#include "atomic_ops.h"
-
 #include "BLI_utildefines.h"

 #include "BKE_DerivedMesh.hh"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_curve.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_mapping.hh"
-#include "BKE_object.hh"
-#include "BKE_paint.hh"
 #include "BKE_pbvh.hh"

 #include "DNA_curve_types.h" /* for Curve */
 #include "DNA_mesh_types.h"
-#include "DNA_object_types.h"

 #include "MEM_guardedalloc.h"

--- a/source/blender/blenkernel/intern/cloth.cc
+++ b/source/blender/blenkernel/intern/cloth.cc
@ -32,7 +32,6 @@
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
 #include "BKE_pointcache.h"

@ -273,7 +272,7 @@ static int do_step_cloth(

    /* Get the current position. */
    copy_v3_v3(verts->xconst, positions[i]);
-    mul_m4_v3(ob->object_to_world, verts->xconst);
+    mul_m4_v3(ob->object_to_world().ptr(), verts->xconst);

    if (vert_mass_changed) {
      verts->mass = clmd->sim_parms->mass;
@ -576,11 +575,11 @@ static void cloth_to_object(Object *ob, ClothModifierData *clmd, float (*vertexC

  if (clmd->clothObject) {
    /* Inverse matrix is not up to date. */
-    invert_m4_m4(ob->world_to_object, ob->object_to_world);
+    invert_m4_m4(ob->runtime->world_to_object.ptr(), ob->object_to_world().ptr());

    for (i = 0; i < cloth->mvert_num; i++) {
      copy_v3_v3(vertexCos[i], cloth->verts[i].x);
-      mul_m4_v3(ob->world_to_object, vertexCos[i]); /* cloth is in global coords */
+      mul_m4_v3(ob->world_to_object().ptr(), vertexCos[i]); /* cloth is in global coords */
    }
  }
 }
@ -760,11 +759,11 @@ static bool cloth_from_object(
    if (first) {
      copy_v3_v3(verts->x, positions[i]);

-      mul_m4_v3(ob->object_to_world, verts->x);
+      mul_m4_v3(ob->object_to_world().ptr(), verts->x);

      if (shapekey_rest) {
        copy_v3_v3(verts->xrest, shapekey_rest[i]);
-        mul_m4_v3(ob->object_to_world, verts->xrest);
+        mul_m4_v3(ob->object_to_world().ptr(), verts->xrest);
      }
      else {
        copy_v3_v3(verts->xrest, verts->x);
@ -1154,7 +1153,7 @@ static void cloth_update_verts(Object *ob, ClothModifierData *clmd, Mesh *mesh)
  /* vertex count is already ensured to match */
  for (i = 0; i < mesh->verts_num; i++, verts++) {
    copy_v3_v3(verts->xrest, positions[i]);
-    mul_m4_v3(ob->object_to_world, verts->xrest);
+    mul_m4_v3(ob->object_to_world().ptr(), verts->xrest);
  }
 }

--- a/source/blender/blenkernel/intern/collision.cc
+++ b/source/blender/blenkernel/intern/collision.cc
@ -11,14 +11,10 @@
 #include "MEM_guardedalloc.h"

 #include "DNA_cloth_types.h"
-#include "DNA_collection_types.h"
-#include "DNA_effect_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

-#include "BLI_blenlib.h"
-#include "BLI_linklist.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_vector.h"
 #include "BLI_task.h"
@ -27,10 +23,7 @@

 #include "BKE_cloth.hh"
 #include "BKE_collection.hh"
-#include "BKE_effect.h"
-#include "BKE_layer.hh"
 #include "BKE_modifier.hh"
-#include "BKE_scene.hh"

 #include "BKE_collision.h"
 #include "BLI_kdopbvh.h"
--- a/source/blender/blenkernel/intern/colorband.cc
+++ b/source/blender/blenkernel/intern/colorband.cc
@ -18,7 +18,6 @@

 #include "BKE_colorband.hh"
 #include "BKE_key.hh"
-#include "BKE_material.h"

 void BKE_colorband_init(ColorBand *coba, bool rangetype)
 {
--- a/source/blender/blenkernel/intern/constraint.cc
+++ b/source/blender/blenkernel/intern/constraint.cc
@ -155,7 +155,7 @@ bConstraintOb *BKE_constraints_make_evalob(
          /* Quaternion/Axis-Angle, so Eulers should just use default order. */
          cob->rotOrder = EULER_ORDER_DEFAULT;
        }
-        copy_m4_m4(cob->matrix, ob->object_to_world);
+        copy_m4_m4(cob->matrix, ob->object_to_world().ptr());
      }
      else {
        unit_m4(cob->matrix);
@ -181,7 +181,7 @@ bConstraintOb *BKE_constraints_make_evalob(
        }

        /* matrix in world-space */
-        mul_m4_m4m4(cob->matrix, ob->object_to_world, cob->pchan->pose_mat);
+        mul_m4_m4m4(cob->matrix, ob->object_to_world().ptr(), cob->pchan->pose_mat);
      }
      else {
        unit_m4(cob->matrix);
@ -222,7 +222,7 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob)
      /* cob->ob might not exist! */
      if (cob->ob) {
        /* copy new ob-matrix back to owner */
-        copy_m4_m4(cob->ob->object_to_world, cob->matrix);
+        copy_m4_m4(cob->ob->runtime->object_to_world.ptr(), cob->matrix);

        /* copy inverse of delta back to owner */
        invert_m4_m4(cob->ob->constinv, delta);
@ -233,7 +233,7 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob)
      /* cob->ob or cob->pchan might not exist */
      if (cob->ob && cob->pchan) {
        /* copy new pose-matrix back to owner */
-        mul_m4_m4m4(cob->pchan->pose_mat, cob->ob->world_to_object, cob->matrix);
+        mul_m4_m4m4(cob->pchan->pose_mat, cob->ob->world_to_object().ptr(), cob->matrix);

        /* copy inverse of delta back to owner */
        invert_m4_m4(cob->pchan->constinv, delta);
@ -282,7 +282,7 @@ void BKE_constraint_mat_convertspace(Object *ob,
        }
        else {
          /* World to pose. */
-          invert_m4_m4(imat, ob->object_to_world);
+          invert_m4_m4(imat, ob->object_to_world().ptr());
          mul_m4_m4m4(mat, imat, mat);

          /* Use pose-space as stepping stone for other spaces. */
@ -326,7 +326,7 @@ void BKE_constraint_mat_convertspace(Object *ob,
        }
        else {
          /* Pose to world. */
-          mul_m4_m4m4(mat, ob->object_to_world, mat);
+          mul_m4_m4m4(mat, ob->object_to_world().ptr(), mat);
          /* Use world-space as stepping stone for other spaces. */
          if (to != CONSTRAINT_SPACE_WORLD) {
            /* Call self with slightly different values. */
@ -436,7 +436,7 @@ void BKE_constraint_mat_convertspace(Object *ob,
        /* Check if object has a parent. */
        if (ob->parent) {
          /* 'subtract' parent's effects from owner. */
-          mul_m4_m4m4(diff_mat, ob->parent->object_to_world, ob->parentinv);
+          mul_m4_m4m4(diff_mat, ob->parent->object_to_world().ptr(), ob->parentinv);
          invert_m4_m4_safe(imat, diff_mat);
          mul_m4_m4m4(mat, imat, mat);
        }
@ -472,7 +472,7 @@ void BKE_constraint_mat_convertspace(Object *ob,
      /* check that object has a parent - otherwise this won't work */
      if (ob->parent) {
        /* 'add' parent's effect back to owner */
-        mul_m4_m4m4(diff_mat, ob->parent->object_to_world, ob->parentinv);
+        mul_m4_m4m4(diff_mat, ob->parent->object_to_world().ptr(), ob->parentinv);
        mul_m4_m4m4(mat, diff_mat, mat);
      }
      else {
@ -525,7 +525,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
  const int defgroup = BKE_object_defgroup_name_index(ob, substring);

  /* initialize target matrix using target matrix */
-  copy_m4_m4(mat, ob->object_to_world);
+  copy_m4_m4(mat, ob->object_to_world().ptr());

  /* get index of vertex group */
  if (defgroup == -1) {
@ -591,7 +591,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
   *   calc_gizmo_stats, V3D_ORIENT_NORMAL case */

  /* We need the transpose of the inverse for a normal. */
-  copy_m3_m4(imat, ob->object_to_world);
+  copy_m3_m4(imat, ob->object_to_world().ptr());

  invert_m3_m3(tmat, imat);
  transpose_m3(tmat);
@ -612,7 +612,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
  normalize_m4(mat);

  /* apply the average coordinate as the new location */
-  mul_v3_m4v3(mat[3], ob->object_to_world, vec);
+  mul_v3_m4v3(mat[3], ob->object_to_world().ptr(), vec);
 }

 /* function that sets the given matrix based on given vertex group in lattice */
@ -634,7 +634,7 @@ static void contarget_get_lattice_mat(Object *ob, const char *substring, float m
  const int defgroup = BKE_object_defgroup_name_index(ob, substring);

  /* initialize target matrix using target matrix */
-  copy_m4_m4(mat, ob->object_to_world);
+  copy_m4_m4(mat, ob->object_to_world().ptr());

  /* get index of vertex group */
  if (defgroup == -1) {
@ -668,11 +668,12 @@ static void contarget_get_lattice_mat(Object *ob, const char *substring, float m
    }
  }

-  /* find average location, then multiply by ob->object_to_world to find world-space location */
+  /* find average location, then multiply by ob->object_to_world().ptr() to find world-space
+   * location */
  if (grouped) {
    mul_v3_fl(vec, 1.0f / grouped);
  }
-  mul_v3_m4v3(tvec, ob->object_to_world, vec);
+  mul_v3_m4v3(tvec, ob->object_to_world().ptr(), vec);

  /* copy new location to matrix */
  copy_v3_v3(mat[3], tvec);
@ -691,7 +692,7 @@ static void constraint_target_to_mat4(Object *ob,
 {
  /* Case OBJECT */
  if (substring[0] == '\0') {
-    copy_m4_m4(mat, ob->object_to_world);
+    copy_m4_m4(mat, ob->object_to_world().ptr());
    BKE_constraint_mat_convertspace(ob, nullptr, cob, mat, from, to, false);
  }
  /* Case VERTEXGROUP */
@ -726,7 +727,7 @@ static void constraint_target_to_mat4(Object *ob,

      if (headtail < 0.000001f && !(is_bbone && full_bbone)) {
        /* skip length interpolation if set to head */
-        mul_m4_m4m4(mat, ob->object_to_world, pchan->pose_mat);
+        mul_m4_m4m4(mat, ob->object_to_world().ptr(), pchan->pose_mat);
      }
      else if (is_bbone && pchan->bone->segments == pchan->runtime.bbone_segments) {
        /* use point along bbone */
@ -752,7 +753,7 @@ static void constraint_target_to_mat4(Object *ob,
          mul_v3_m4v3(tempmat[3], pchan->pose_mat, loc);
        }

-        mul_m4_m4m4(mat, ob->object_to_world, tempmat);
+        mul_m4_m4m4(mat, ob->object_to_world().ptr(), tempmat);
      }
      else {
        float tempmat[4][4], loc[3];
@ -764,11 +765,11 @@ static void constraint_target_to_mat4(Object *ob,
        copy_m4_m4(tempmat, pchan->pose_mat);
        copy_v3_v3(tempmat[3], loc);

-        mul_m4_m4m4(mat, ob->object_to_world, tempmat);
+        mul_m4_m4m4(mat, ob->object_to_world().ptr(), tempmat);
      }
    }
    else {
-      copy_m4_m4(mat, ob->object_to_world);
+      copy_m4_m4(mat, ob->object_to_world().ptr());
    }

    /* convert matrix space as required */
@ -1078,7 +1079,7 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
  if (data->flag & CHILDOF_SET_INVERSE) {
    invert_m4_m4(data->invmat, parmat);
    if (cob->pchan != nullptr) {
-      mul_m4_series(data->invmat, data->invmat, cob->ob->object_to_world);
+      mul_m4_series(data->invmat, data->invmat, cob->ob->object_to_world().ptr());
    }

    copy_m4_m4(inverse_matrix, data->invmat);
@ -1398,8 +1399,8 @@ static void kinematic_get_tarmat(Depsgraph * /*depsgraph*/,
      else {
        float vec[3];
        /* move grabtarget into world space */
-        mul_v3_m4v3(vec, ob->object_to_world, data->grabtarget);
-        copy_m4_m4(ct->matrix, ob->object_to_world);
+        mul_v3_m4v3(vec, ob->object_to_world().ptr(), data->grabtarget);
+        copy_m4_m4(ct->matrix, ob->object_to_world().ptr());
        copy_v3_v3(ct->matrix[3], vec);
      }
    }
@ -1539,7 +1540,7 @@ static void followpath_get_tarmat(Depsgraph * /*depsgraph*/,

        copy_v3_v3(totmat[3], vec);

-        mul_m4_m4m4(ct->matrix, ct->tar->object_to_world, totmat);
+        mul_m4_m4m4(ct->matrix, ct->tar->object_to_world().ptr(), totmat);
      }
    }
  }
@ -2569,7 +2570,7 @@ static void armdef_get_tarmat(Depsgraph * /*depsgraph*/,
      bPoseChannel *pchan = BKE_pose_channel_find_name(ct->tar->pose, ct->subtarget);

      if (pchan != nullptr) {
-        mul_m4_m4m4(ct->matrix, ct->tar->object_to_world, pchan->pose_mat);
+        mul_m4_m4m4(ct->matrix, ct->tar->object_to_world().ptr(), pchan->pose_mat);
        return;
      }
    }
@ -2626,7 +2627,7 @@ static void armdef_accumulate_bone(const bConstraintTarget *ct,
  float weight = ct->weight;

  /* Our object's location in target pose space. */
-  invert_m4_m4(iobmat, ct->tar->object_to_world);
+  invert_m4_m4(iobmat, ct->tar->object_to_world().ptr());
  mul_v3_m4v3(co, iobmat, wco);

  /* Multiply by the envelope weight when appropriate. */
@ -2651,7 +2652,7 @@ static void armdef_accumulate_bone(const bConstraintTarget *ct,
      mul_m4_m4m4(basemat, bone->arm_mat, b_bone_rest_mats[index].mat);
    }

-    armdef_accumulate_matrix(ct->tar->object_to_world,
+    armdef_accumulate_matrix(ct->tar->object_to_world().ptr(),
                             iobmat,
                             basemat,
                             b_bone_mats[index + 1].mat,
@ -2665,7 +2666,7 @@ static void armdef_accumulate_bone(const bConstraintTarget *ct,
      mul_m4_m4m4(basemat, bone->arm_mat, b_bone_rest_mats[index + 1].mat);
    }

-    armdef_accumulate_matrix(ct->tar->object_to_world,
+    armdef_accumulate_matrix(ct->tar->object_to_world().ptr(),
                             iobmat,
                             basemat,
                             b_bone_mats[index + 2].mat,
@ -2676,7 +2677,7 @@ static void armdef_accumulate_bone(const bConstraintTarget *ct,
  }
  else {
    /* Simple bone. This requires DEG_OPCODE_BONE_DONE dependency due to chan_mat. */
-    armdef_accumulate_matrix(ct->tar->object_to_world,
+    armdef_accumulate_matrix(ct->tar->object_to_world().ptr(),
                             iobmat,
                             bone->arm_mat,
                             pchan->chan_mat,
@ -2709,7 +2710,7 @@ static void armdef_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ
    /* For constraints on bones, use the rest position to bind b-bone segments
     * and envelopes, to allow safely changing the bone location as if parented. */
    copy_v3_v3(input_co, cob->pchan->bone->arm_head);
-    mul_m4_v3(cob->ob->object_to_world, input_co);
+    mul_m4_v3(cob->ob->object_to_world().ptr(), input_co);
  }
  else {
    copy_v3_v3(input_co, cob->matrix[3]);
@ -3941,7 +3942,7 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
        unit_m4(totmat);
        copy_v3_v3(totmat[3], vec);

-        mul_m4_m4m4(targetMatrix, ct->tar->object_to_world, totmat);
+        mul_m4_m4m4(targetMatrix, ct->tar->object_to_world().ptr(), totmat);
      }
    }

@ -4242,7 +4243,7 @@ static void shrinkwrap_get_tarmat(Depsgraph * /*depsgraph*/,
    if (BKE_shrinkwrap_init_tree(
            &tree, target_eval, scon->shrinkType, scon->shrinkMode, do_track_normal))
    {
-      BLI_space_transform_from_matrices(&transform, cob->matrix, ct->tar->object_to_world);
+      BLI_space_transform_from_matrices(&transform, cob->matrix, ct->tar->object_to_world().ptr());

      switch (scon->shrinkType) {
        case MOD_SHRINKWRAP_NEAREST_SURFACE:
@ -4916,7 +4917,7 @@ static void followtrack_evaluate_using_3d_position_object(FollowTrackContext *co

  /* Object matrix of the camera. */
  float camera_obmat[4][4];
-  copy_m4_m4(camera_obmat, camera_object->object_to_world);
+  copy_m4_m4(camera_obmat, camera_object->object_to_world().ptr());

  /* Calculate inverted matrix of the solved camera at the current time. */
  float reconstructed_camera_mat[4][4];
@ -5068,10 +5069,11 @@ static void followtrack_project_to_depth_object_if_needed(FollowTrackContext *co
  }

  float depth_object_mat_inv[4][4];
-  invert_m4_m4(depth_object_mat_inv, depth_object->object_to_world);
+  invert_m4_m4(depth_object_mat_inv, depth_object->object_to_world().ptr());

  float ray_start[3], ray_end[3];
-  mul_v3_m4v3(ray_start, depth_object_mat_inv, context->camera_object->object_to_world[3]);
+  mul_v3_m4v3(
+      ray_start, depth_object_mat_inv, context->camera_object->object_to_world().location());
  mul_v3_m4v3(ray_end, depth_object_mat_inv, cob->matrix[3]);

  float ray_direction[3];
@ -5094,7 +5096,7 @@ static void followtrack_project_to_depth_object_if_needed(FollowTrackContext *co
                                          &tree_data);

  if (result != -1) {
-    mul_v3_m4v3(cob->matrix[3], depth_object->object_to_world, hit.co);
+    mul_v3_m4v3(cob->matrix[3], depth_object->object_to_world().ptr(), hit.co);
  }

  free_bvhtree_from_mesh(&tree_data);
@ -5142,9 +5144,9 @@ static void followtrack_evaluate_using_2d_position(FollowTrackContext *context,
    }

    float disp[3];
-    mul_v3_m4v3(disp, camera_object->object_to_world, vec);
+    mul_v3_m4v3(disp, camera_object->object_to_world().ptr(), vec);

-    copy_m4_m4(rmat, camera_object->object_to_world);
+    copy_m4_m4(rmat, camera_object->object_to_world().ptr());
    zero_v3(rmat[3]);
    mul_m4_m4m4(cob->matrix, cob->matrix, rmat);

@ -5166,10 +5168,10 @@ static void followtrack_evaluate_using_2d_position(FollowTrackContext *context,
    }

    float disp[3];
-    mul_v3_m4v3(disp, camera_object->object_to_world, vec);
+    mul_v3_m4v3(disp, camera_object->object_to_world().ptr(), vec);

    /* apply camera rotation so Z-axis would be co-linear */
-    copy_m4_m4(rmat, camera_object->object_to_world);
+    copy_m4_m4(rmat, camera_object->object_to_world().ptr());
    zero_v3(rmat[3]);
    mul_m4_m4m4(cob->matrix, cob->matrix, rmat);

@ -5315,7 +5317,7 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
  BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, framenr, mat);

  invert_m4_m4(imat, mat);
-  mul_m4_m4m4(parmat, camob->object_to_world, imat);
+  mul_m4_m4m4(parmat, camob->object_to_world().ptr(), imat);

  copy_m4_m4(obmat, cob->matrix);

@ -5668,7 +5670,7 @@ bool BKE_constraint_apply_for_object(Depsgraph *depsgraph,
  BLI_freelinkN(&single_con, new_con);

  /* Apply transform from matrix. */
-  BKE_object_apply_mat4(ob, ob_eval->object_to_world, true, true);
+  BKE_object_apply_mat4(ob, ob_eval->object_to_world().ptr(), true, true);

  return true;
 }
@ -6261,7 +6263,7 @@ void BKE_constraint_target_matrix_get(Depsgraph *depsgraph,
        cob->ob = (Object *)ownerdata;
        cob->pchan = nullptr;
        if (cob->ob) {
-          copy_m4_m4(cob->matrix, cob->ob->object_to_world);
+          copy_m4_m4(cob->matrix, cob->ob->object_to_world().ptr());
          copy_m4_m4(cob->startmat, cob->matrix);
        }
        else {
--- a/source/blender/blenkernel/intern/context.cc
+++ b/source/blender/blenkernel/intern/context.cc
@ -38,6 +38,7 @@
 #include "BKE_scene.hh"
 #include "BKE_screen.hh"
 #include "BKE_sound.h"
+#include "BKE_wm_runtime.hh"
 #include "BKE_workspace.h"

 #include "RE_engine.h"
@ -706,7 +707,7 @@ wmWindowManager *CTX_wm_manager(const bContext *C)

 bool CTX_wm_interface_locked(const bContext *C)
 {
-  return bool(C->wm.manager->is_interface_locked);
+  return C->wm.manager->runtime->is_interface_locked;
 }

 wmWindow *CTX_wm_window(const bContext *C)
--- a/source/blender/blenkernel/intern/cpp_types.cc
+++ b/source/blender/blenkernel/intern/cpp_types.cc
@ -6,7 +6,6 @@
 #include "BLI_cpp_type_make.hh"
 #include "BLI_cpp_types_make.hh"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_math_quaternion_types.hh"
 #include "BLI_math_vector_types.hh"

 #include "BKE_cpp_types.hh"
--- a/source/blender/blenkernel/intern/crazyspace.cc
+++ b/source/blender/blenkernel/intern/crazyspace.cc
@ -11,9 +11,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"

-#include "BLI_bitmap.h"
 #include "BLI_linklist.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@ -30,7 +28,6 @@
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_multires.hh"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_report.hh"

--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@ -40,24 +40,18 @@
 #include "DNA_object_types.h"
 #include "DNA_vfont_types.h"

-#include "BKE_anim_data.h"
 #include "BKE_curve.hh"
 #include "BKE_curveprofile.h"
-#include "BKE_displist.h"
 #include "BKE_idtype.hh"
 #include "BKE_key.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_main.hh"
-#include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_vfont.hh"

 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

-#include "CLG_log.h"
-
 #include "BLO_read_write.hh"

 using blender::float3;
--- a/source/blender/blenkernel/intern/curve_bevel.cc
+++ b/source/blender/blenkernel/intern/curve_bevel.cc
@ -11,9 +11,8 @@

 #include <cstring>

-#include "BLI_alloca.h"
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
+#include "BLI_math_base.h" /* Needed with MSVC for M_PI & M_PI_2. */

 #include "MEM_guardedalloc.h"

@ -22,7 +21,6 @@
 #include "DNA_object_types.h"

 #include "BKE_curve.hh"
-#include "BKE_curveprofile.h"
 #include "BKE_displist.h"
 #include "BKE_object_types.hh"

--- a/source/blender/blenkernel/intern/curve_convert.cc
+++ b/source/blender/blenkernel/intern/curve_convert.cc
@ -8,14 +8,12 @@

 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
-#include "DNA_vfont_types.h"

 #include "BLI_utildefines.h"

 #include "BKE_curve.hh"
 #include "BKE_displist.h"
 #include "BKE_lib_id.hh"
-#include "BKE_modifier.hh"
 #include "BKE_vfont.hh"

 #include "DEG_depsgraph.hh"
--- a/source/blender/blenkernel/intern/curve_decimate.cc
+++ b/source/blender/blenkernel/intern/curve_decimate.cc
@ -18,10 +18,10 @@ extern "C" {
 #include "curve_fit_nd.h"
 }

-#include "BLI_strict_flags.h"
-
 #include <cstring>

+#include "BLI_strict_flags.h" /* Keep last. */
+
 struct Knot {
  Knot *next, *prev;
  uint point_index; /* Index in point array. */
--- a/source/blender/blenkernel/intern/curve_deform.cc
+++ b/source/blender/blenkernel/intern/curve_deform.cc
@ -25,7 +25,6 @@
 #include "BKE_anim_path.h"
 #include "BKE_curve.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_lattice.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object_types.hh"

@ -48,8 +47,8 @@ struct CurveDeform {
 static void init_curve_deform(const Object *ob_curve, const Object *ob_target, CurveDeform *cd)
 {
  float imat[4][4];
-  invert_m4_m4(imat, ob_target->object_to_world);
-  mul_m4_m4m4(cd->objectspace, imat, ob_curve->object_to_world);
+  invert_m4_m4(imat, ob_target->object_to_world().ptr());
+  mul_m4_m4m4(cd->objectspace, imat, ob_curve->object_to_world().ptr());
  invert_m4_m4(cd->curvespace, cd->objectspace);
  copy_m3_m4(cd->objectspace3, cd->objectspace);
  cd->no_rot_axis = 0;
--- a/source/blender/blenkernel/intern/curves.cc
+++ b/source/blender/blenkernel/intern/curves.cc
@ -17,7 +17,6 @@
 #include "DNA_object_types.h"

 #include "BLI_index_range.hh"
-#include "BLI_listbase.h"
 #include "BLI_math_base.h"
 #include "BLI_math_matrix.hh"
 #include "BLI_rand.hh"
@ -28,15 +27,11 @@

 #include "BKE_anim_data.h"
 #include "BKE_curves.hh"
-#include "BKE_customdata.hh"
 #include "BKE_geometry_fields.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
-#include "BKE_lib_remap.hh"
-#include "BKE_main.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
@ -317,11 +312,11 @@ void curves_copy_parameters(const Curves &src, Curves &dst)

 CurvesSurfaceTransforms::CurvesSurfaceTransforms(const Object &curves_ob, const Object *surface_ob)
 {
-  this->curves_to_world = float4x4_view(curves_ob.object_to_world);
+  this->curves_to_world = curves_ob.object_to_world();
  this->world_to_curves = math::invert(this->curves_to_world);

  if (surface_ob != nullptr) {
-    this->surface_to_world = float4x4_view(surface_ob->object_to_world);
+    this->surface_to_world = surface_ob->object_to_world();
    this->world_to_surface = math::invert(this->surface_to_world);
    this->surface_to_curves = this->world_to_curves * this->surface_to_world;
    this->curves_to_surface = this->world_to_surface * this->curves_to_world;
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@ -24,6 +24,7 @@
 #include "BLI_endian_switch.h"
 #include "BLI_index_range.hh"
 #include "BLI_math_color_blend.h"
+#include "BLI_math_matrix.hh"
 #include "BLI_math_quaternion_types.hh"
 #include "BLI_math_vector.hh"
 #include "BLI_mempool.h"
@ -113,6 +114,7 @@ bool CustomData_MeshMasks_are_matching(const CustomData_MeshMasks *mask_ref,

 struct LayerTypeInfo {
  int size; /* the memory size of one element of this layer's data */
+  int alignment;

  /** name of the struct used, for file writing */
  const char *structname;
@ -1526,6 +1528,16 @@ static void layerDefault_propquaternion(void *data, const int count)
  MutableSpan(static_cast<math::Quaternion *>(data), count).fill(math::Quaternion::identity());
 }

+/* -------------------------------------------------------------------- */
+/** \name Callbacks for (#math::Quaternion, #CD_PROP_FLOAT4X4)
+ * \{ */
+
+static void layerDefault_propfloat4x4(void *data, const int count)
+{
+  using namespace blender;
+  MutableSpan(static_cast<float4x4 *>(data), count).fill(float4x4::identity());
+}
+
 /** \} */

 /* -------------------------------------------------------------------- */
@ -1534,11 +1546,30 @@ static void layerDefault_propquaternion(void *data, const int count)

 static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
    /* 0: CD_MVERT */ /* DEPRECATED */
-    {sizeof(MVert), "MVert", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MVert),
+     alignof(MVert),
+     "MVert",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 1: CD_MSTICKY */ /* DEPRECATED */
-    {sizeof(float[2]), "", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[2]),
+     alignof(float2),
+     "",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 2: CD_MDEFORMVERT */
    {sizeof(MDeformVert),
+     alignof(MDeformVert),
     "MDeformVert",
     1,
     nullptr,
@ -1549,11 +1580,30 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     layerConstruct_mdeformvert},
    /* 3: CD_MEDGE */ /* DEPRECATED */
-    {sizeof(MEdge), "MEdge", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MEdge),
+     alignof(MEdge),
+     "MEdge",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 4: CD_MFACE */
-    {sizeof(MFace), "MFace", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MFace),
+     alignof(MFace),
+     "MFace",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 5: CD_MTFACE */
    {sizeof(MTFace),
+     alignof(MTFace),
     "MTFace",
     1,
     N_("UVMap"),
@ -1576,18 +1626,31 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerMaxNum_tface},
    /* 6: CD_MCOL */
    /* 4 MCol structs per face */
-    {sizeof(MCol[4]),  "MCol",         4,
-     N_("Col"),        nullptr,        nullptr,
-     layerInterp_mcol, layerSwap_mcol, layerDefault_mcol,
-     nullptr,          nullptr,        nullptr,
-     nullptr,          nullptr,        nullptr,
-     nullptr,          nullptr,        nullptr,
-     nullptr,          nullptr,        nullptr},
+    {sizeof(MCol[4]),
+     alignof(MCol[4]),
+     "MCol",
+     4,
+     N_("Col"),
+     nullptr,
+     nullptr,
+     layerInterp_mcol,
+     layerSwap_mcol,
+     layerDefault_mcol},
    /* 7: CD_ORIGINDEX */
-    {sizeof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, layerDefault_origindex},
+    {sizeof(int),
+     alignof(int),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     layerDefault_origindex},
    /* 8: CD_NORMAL */
    /* 3 floats per normal vector */
    {sizeof(float[3]),
+     alignof(blender::float3),
     "vec3f",
     1,
     nullptr,
@ -1605,9 +1668,10 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     layerCopyValue_normal},
    /* 9: CD_FACEMAP */ /* DEPRECATED */
-    {sizeof(int), ""},
+    {sizeof(int), alignof(int), ""},
    /* 10: CD_PROP_FLOAT */
    {sizeof(MFloatProperty),
+     alignof(float),
     "MFloatProperty",
     1,
     N_("Float"),
@ -1620,6 +1684,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerValidate_propFloat},
    /* 11: CD_PROP_INT32 */
    {sizeof(MIntProperty),
+     alignof(int),
     "MIntProperty",
     1,
     N_("Int"),
@ -1629,6 +1694,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr},
    /* 12: CD_PROP_STRING */
    {sizeof(MStringProperty),
+     alignof(MStringProperty),
     "MStringProperty",
     1,
     N_("String"),
@ -1638,6 +1704,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr},
    /* 13: CD_ORIGSPACE */
    {sizeof(OrigSpaceFace),
+     alignof(OrigSpaceFace),
     "OrigSpaceFace",
     1,
     N_("UVMap"),
@ -1647,15 +1714,25 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerSwap_origspace_face,
     layerDefault_origspace_face},
    /* 14: CD_ORCO */
-    {sizeof(float[3]), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[3]),
+     alignof(blender::float3),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 15: CD_MTEXPOLY */ /* DEPRECATED */
    /* NOTE: when we expose the UV Map / TexFace split to the user,
     * change this back to face Texture. */
-    {sizeof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(int), alignof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
    /* 16: CD_MLOOPUV */ /* DEPRECATED */
-    {sizeof(MLoopUV), "MLoopUV", 1, N_("UVMap")},
+    {sizeof(MLoopUV), alignof(MLoopUV), "MLoopUV", 1, N_("UVMap")},
    /* 17: CD_PROP_BYTE_COLOR */
    {sizeof(MLoopCol),
+     alignof(MLoopCol),
     "MLoopCol",
     1,
     N_("Col"),
@ -1677,9 +1754,19 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     nullptr},
    /* 18: CD_TANGENT */
-    {sizeof(float[4][4]), "", 0, N_("Tangent"), nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[4][4]),
+     alignof(float[4][4]),
+     "",
+     0,
+     N_("Tangent"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 19: CD_MDISPS */
    {sizeof(MDisps),
+     alignof(MDisps),
     "MDisps",
     1,
     nullptr,
@ -1700,11 +1787,30 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerWrite_mdisps,
     layerFilesize_mdisps},
    /* 20: CD_PREVIEW_MCOL */
-    {},
+    {sizeof(blender::float4x4),
+     alignof(blender::float4x4),
+     "mat4x4f",
+     1,
+     N_("4 by 4 Float Matrix"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     layerDefault_propfloat4x4},
    /* 21: CD_ID_MCOL */ /* DEPRECATED */
-    {sizeof(MCol[4]), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MCol[4]),
+     alignof(MCol[4]),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 22: CD_TEXTURE_MCOL */
    {sizeof(MCol[4]),
+     alignof(MCol[4]),
     "MCol",
     4,
     N_("TexturedCol"),
@ -1714,13 +1820,40 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerSwap_mcol,
     layerDefault_mcol},
    /* 23: CD_CLOTH_ORCO */
-    {sizeof(float[3]), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[3]),
+     alignof(float[3]),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 24: CD_RECAST */
-    {sizeof(MRecast), "MRecast", 1, N_("Recast"), nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MRecast),
+     alignof(MRecast),
+     "MRecast",
+     1,
+     N_("Recast"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 25: CD_MPOLY */ /* DEPRECATED */
-    {sizeof(MPoly), "MPoly", 1, N_("NGon Face"), nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(MPoly),
+     alignof(MPoly),
+     "MPoly",
+     1,
+     N_("NGon Face"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 26: CD_MLOOP */ /* DEPRECATED */
    {sizeof(MLoop),
+     alignof(MLoop),
     "MLoop",
     1,
     N_("NGon Face-Vertex"),
@ -1730,15 +1863,23 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     nullptr},
    /* 27: CD_SHAPE_KEYINDEX */
-    {sizeof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(int), alignof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
    /* 28: CD_SHAPEKEY */
-    {sizeof(float[3]), "", 0, N_("ShapeKey"), nullptr, nullptr, layerInterp_shapekey},
+    {sizeof(float[3]),
+     alignof(float[3]),
+     "",
+     0,
+     N_("ShapeKey"),
+     nullptr,
+     nullptr,
+     layerInterp_shapekey},
    /* 29: CD_BWEIGHT */ /* DEPRECATED */
-    {sizeof(MFloatProperty), "MFloatProperty", 1},
+    {sizeof(MFloatProperty), alignof(MFloatProperty), "MFloatProperty", 1},
    /* 30: CD_CREASE */ /* DEPRECATED */
-    {sizeof(float), ""},
+    {sizeof(float), alignof(float), ""},
    /* 31: CD_ORIGSPACE_MLOOP */
    {sizeof(OrigSpaceLoop),
+     alignof(OrigSpaceLoop),
     "OrigSpaceLoop",
     1,
     N_("OS Loop"),
@ -1759,6 +1900,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
    {},
    /* 33: CD_BM_ELEM_PYPTR */
    {sizeof(void *),
+     alignof(void *),
     "",
     1,
     nullptr,
@ -1768,9 +1910,10 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     nullptr},
    /* 34: CD_PAINT_MASK */ /* DEPRECATED */
-    {sizeof(float), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float), alignof(float), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
    /* 35: CD_GRID_PAINT_MASK */
    {sizeof(GridPaintMask),
+     alignof(GridPaintMask),
     "GridPaintMask",
     1,
     nullptr,
@ -1782,6 +1925,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerConstruct_grid_paint_mask},
    /* 36: CD_MVERT_SKIN */
    {sizeof(MVertSkin),
+     alignof(MVertSkin),
     "MVertSkin",
     1,
     nullptr,
@ -1792,6 +1936,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerDefault_mvert_skin},
    /* 37: CD_FREESTYLE_EDGE */
    {sizeof(FreestyleEdge),
+     alignof(FreestyleEdge),
     "FreestyleEdge",
     1,
     nullptr,
@ -1802,6 +1947,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr},
    /* 38: CD_FREESTYLE_FACE */
    {sizeof(FreestyleFace),
+     alignof(FreestyleFace),
     "FreestyleFace",
     1,
     nullptr,
@ -1811,23 +1957,87 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     nullptr},
    /* 39: CD_MLOOPTANGENT */
-    {sizeof(float[4]), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[4]),
+     alignof(float[4]),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 40: CD_TESSLOOPNORMAL */
-    {sizeof(short[4][3]), "", 0, nullptr, nullptr, nullptr, nullptr, layerSwap_flnor, nullptr},
+    {sizeof(short[4][3]),
+     alignof(short[4][3]),
+     "",
+     0,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     layerSwap_flnor,
+     nullptr},
    /* 41: CD_CUSTOMLOOPNORMAL */
-    {sizeof(short[2]), "vec2s", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(short[2]),
+     alignof(short[2]),
+     "vec2s",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 42: CD_SCULPT_FACE_SETS */ /* DEPRECATED */
-    {sizeof(int), ""},
+    {sizeof(int), alignof(int), ""},
    /* 43: CD_LOCATION */
-    {sizeof(float[3]), "vec3f", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float[3]),
+     alignof(float[3]),
+     "vec3f",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 44: CD_RADIUS */
-    {sizeof(float), "MFloatProperty", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float),
+     alignof(float),
+     "MFloatProperty",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 45: CD_PROP_INT8 */
-    {sizeof(int8_t), "MInt8Property", 1, N_("Int8"), nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(int8_t),
+     alignof(int8_t),
+     "MInt8Property",
+     1,
+     N_("Int8"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 46: CD_PROP_INT32_2D */
-    {sizeof(blender::int2), "vec2i", 1, N_("Int 2D"), nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(blender::int2),
+     alignof(blender::int2),
+     "vec2i",
+     1,
+     N_("Int 2D"),
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 47: CD_PROP_COLOR */
    {sizeof(MPropCol),
+     alignof(MPropCol),
     "MPropCol",
     1,
     N_("Color"),
@ -1850,6 +2060,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr},
    /* 48: CD_PROP_FLOAT3 */
    {sizeof(float[3]),
+     alignof(blender::float3),
     "vec3f",
     1,
     N_("Float3"),
@ -1866,6 +2077,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerAdd_propfloat3},
    /* 49: CD_PROP_FLOAT2 */
    {sizeof(float[2]),
+     alignof(float2),
     "vec2f",
     1,
     N_("Float2"),
@ -1884,6 +2096,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     layerCopyValue_propfloat2},
    /* 50: CD_PROP_BOOL */
    {sizeof(bool),
+     alignof(bool),
     "bool",
     1,
     N_("Boolean"),
@ -1898,9 +2111,19 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     nullptr,
     nullptr},
    /* 51: CD_HAIRLENGTH */ /* DEPRECATED */ /* UNUSED */
-    {sizeof(float), "float", 1, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(float),
+     alignof(float),
+     "float",
+     1,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr,
+     nullptr},
    /* 52: CD_PROP_QUATERNION */
    {sizeof(float[4]),
+     alignof(blender::float4),
     "vec4f",
     1,
     N_("Quaternion"),
@ -2134,12 +2357,15 @@ static bool customdata_typemap_is_valid(const CustomData *data)
 static void *copy_layer_data(const eCustomDataType type, const void *data, const int totelem)
 {
  const LayerTypeInfo &type_info = *layerType_getInfo(type);
+  const int64_t size_in_bytes = int64_t(totelem) * type_info.size;
+  void *new_data = MEM_mallocN_aligned(size_in_bytes, type_info.alignment, __func__);
  if (type_info.copy) {
-    void *new_data = MEM_malloc_arrayN(size_t(totelem), type_info.size, __func__);
    type_info.copy(data, new_data, totelem);
-    return new_data;
  }
-  return MEM_dupallocN(data);
+  else {
+    memcpy(new_data, data, size_in_bytes);
+  }
+  return new_data;
 }

 static void free_layer_data(const eCustomDataType type, const void *data, const int totelem)
@ -2389,7 +2615,7 @@ void CustomData_realloc(CustomData *data,
    const int64_t old_size_in_bytes = int64_t(old_size) * typeInfo->size;
    const int64_t new_size_in_bytes = int64_t(new_size) * typeInfo->size;

-    void *new_layer_data = MEM_mallocN(new_size_in_bytes, __func__);
+    void *new_layer_data = MEM_mallocN_aligned(new_size_in_bytes, typeInfo->alignment, __func__);
    /* Copy data to new array. */
    if (old_size_in_bytes) {
      if (typeInfo->copy) {
@ -2877,23 +3103,27 @@ static CustomDataLayer *customData_add_layer__internal(
   * leaks into the new layer. */
  memset(&new_layer, 0, sizeof(CustomDataLayer));

+  const int64_t size_in_bytes = int64_t(totelem) * type_info.size;
+  const char *alloc_name = layerType_getName(type);
+
  if (alloctype.has_value()) {
    switch (*alloctype) {
      case CD_SET_DEFAULT: {
        if (totelem > 0) {
+          new_layer.data = MEM_mallocN_aligned(size_in_bytes, type_info.alignment, alloc_name);
          if (type_info.set_default_value) {
-            new_layer.data = MEM_malloc_arrayN(totelem, type_info.size, layerType_getName(type));
            type_info.set_default_value(new_layer.data, totelem);
          }
          else {
-            new_layer.data = MEM_calloc_arrayN(totelem, type_info.size, layerType_getName(type));
+            /* Alternatively, #MEM_calloc_arrayN is faster, but has no aligned version. */
+            memset(new_layer.data, 0, size_in_bytes);
          }
        }
        break;
      }
      case CD_CONSTRUCT: {
        if (totelem > 0) {
-          new_layer.data = MEM_malloc_arrayN(totelem, type_info.size, layerType_getName(type));
+          new_layer.data = MEM_mallocN_aligned(size_in_bytes, type_info.alignment, alloc_name);
          if (type_info.construct) {
            type_info.construct(new_layer.data, totelem);
          }
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@ -15,12 +15,8 @@
 #include "DNA_curve_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_vfont_types.h"

-#include "BLI_bitmap.h"
 #include "BLI_index_range.hh"
-#include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_math_rotation.h"
 #include "BLI_memarena.h"
@ -36,7 +32,6 @@
 #include "BKE_geometry_set.hh"
 #include "BKE_key.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_mball.hh"
 #include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
--- a/source/blender/blenkernel/intern/dynamicpaint.cc
+++ b/source/blender/blenkernel/intern/dynamicpaint.cc
@ -3760,7 +3760,7 @@ struct DynamicPaintBrushVelocityData {
  const float (*positions_p)[3];
  const float (*positions_c)[3];

-  float (*obmat)[4];
+  const float (*obmat)[4];
  float (*prev_obmat)[4];

  float timescale;
@ -3778,7 +3778,7 @@ static void dynamic_paint_brush_velocity_compute_cb(void *__restrict userdata,
  const float(*positions_p)[3] = data->positions_p;
  const float(*positions_c)[3] = data->positions_c;

-  float(*obmat)[4] = data->obmat;
+  const float(*obmat)[4] = data->obmat;
  float(*prev_obmat)[4] = data->prev_obmat;

  const float timescale = data->timescale;
@ -3832,7 +3832,7 @@ static void dynamicPaint_brushMeshCalculateVelocity(Depsgraph *depsgraph,

  float(*positions_p)[3] = reinterpret_cast<float(*)[3]>(
      mesh_p->vert_positions_for_write().data());
-  copy_m4_m4(prev_obmat, ob->object_to_world);
+  copy_m4_m4(prev_obmat, ob->object_to_world().ptr());

  /* current frame mesh */
  scene->r.cfra = cur_fra;
@ -3865,7 +3865,7 @@ static void dynamicPaint_brushMeshCalculateVelocity(Depsgraph *depsgraph,
  data.brush_vel = *brushVel;
  data.positions_p = positions_p;
  data.positions_c = positions_c;
-  data.obmat = ob->object_to_world;
+  data.obmat = ob->object_to_world().ptr();
  data.prev_obmat = prev_obmat;
  data.timescale = timescale;

@ -3905,7 +3905,7 @@ static void dynamicPaint_brushObjectCalculateVelocity(
                                      SUBFRAME_RECURSION,
                                      BKE_scene_ctime_get(scene),
                                      eModifierType_DynamicPaint);
-  copy_m4_m4(prev_obmat, ob->object_to_world);
+  copy_m4_m4(prev_obmat, ob->object_to_world().ptr());

  /* current frame mesh */
  scene->r.cfra = cur_fra;
@ -3920,7 +3920,7 @@ static void dynamicPaint_brushObjectCalculateVelocity(

  /* calculate speed */
  mul_m4_v3(prev_obmat, prev_loc);
-  mul_m4_v3(ob->object_to_world, cur_loc);
+  mul_m4_v3(ob->object_to_world().ptr(), cur_loc);

  sub_v3_v3v3(brushVel->v, cur_loc, prev_loc);
  mul_v3_fl(brushVel->v, 1.0f / timescale);
@ -4329,14 +4329,14 @@ static bool dynamicPaint_paintMesh(Depsgraph *depsgraph,
     * (Faster than transforming per surface point
     * coordinates and normals to object space) */
    for (ii = 0; ii < numOfVerts; ii++) {
-      mul_m4_v3(brushOb->object_to_world, positions[ii]);
+      mul_m4_v3(brushOb->object_to_world().ptr(), positions[ii]);
      boundInsert(&mesh_bb, positions[ii]);

      /* for proximity project calculate average normal */
      if (brush->flags & MOD_DPAINT_PROX_PROJECT && brush->collision != MOD_DPAINT_COL_VOLUME) {
        float nor[3];
        copy_v3_v3(nor, vert_normals[ii]);
-        mul_mat3_m4_v3(brushOb->object_to_world, nor);
+        mul_mat3_m4_v3(brushOb->object_to_world().ptr(), nor);
        normalize_v3(nor);

        add_v3_v3(avg_brushNor, nor);
@ -5933,7 +5933,7 @@ static bool dynamicPaint_surfaceHasMoved(DynamicPaintSurface *surface, Object *o
  }

  /* matrix comparison */
-  if (!equals_m4m4(bData->prev_obmat, ob->object_to_world)) {
+  if (!equals_m4m4(bData->prev_obmat, ob->object_to_world().ptr())) {
    return true;
  }

@ -6021,7 +6021,7 @@ static void dynamic_paint_generate_bake_data_cb(void *__restrict userdata,
      mul_v3_v3v3(scaled_nor, temp_nor, ob->scale);
      bData->bNormal[index].normal_scale = len_v3(scaled_nor);
    }
-    mul_mat3_m4_v3(ob->object_to_world, temp_nor);
+    mul_mat3_m4_v3(ob->object_to_world().ptr(), temp_nor);
    normalize_v3(temp_nor);
    negate_v3_v3(bData->bNormal[index].invNorm, temp_nor);
  }
@ -6059,7 +6059,7 @@ static void dynamic_paint_generate_bake_data_cb(void *__restrict userdata,
      mul_v3_v3v3(scaled_nor, temp_nor, ob->scale);
      bData->bNormal[index].normal_scale = len_v3(scaled_nor);
    }
-    mul_mat3_m4_v3(ob->object_to_world, temp_nor);
+    mul_mat3_m4_v3(ob->object_to_world().ptr(), temp_nor);
    normalize_v3(temp_nor);
    negate_v3_v3(bData->bNormal[index].invNorm, temp_nor);
  }
@ -6179,7 +6179,7 @@ static bool dynamicPaint_generateBakeData(DynamicPaintSurface *surface,
  bData->mesh_bounds.valid = false;
  for (index = 0; index < canvasNumOfVerts; index++) {
    copy_v3_v3(canvas_verts[index].v, positions[index]);
-    mul_m4_v3(ob->object_to_world, canvas_verts[index].v);
+    mul_m4_v3(ob->object_to_world().ptr(), canvas_verts[index].v);
    boundInsert(&bData->mesh_bounds, canvas_verts[index].v);
  }

@ -6209,7 +6209,7 @@ static bool dynamicPaint_generateBakeData(DynamicPaintSurface *surface,
  dynamicPaint_prepareAdjacencyData(surface, false);

  /* Copy current frame vertices to check against in next frame */
-  copy_m4_m4(bData->prev_obmat, ob->object_to_world);
+  copy_m4_m4(bData->prev_obmat, ob->object_to_world().ptr());
  memcpy(bData->prev_positions, positions.data(), canvasNumOfVerts * sizeof(float[3]));

  bData->clear = 0;
--- a/source/blender/blenkernel/intern/editmesh.cc
+++ b/source/blender/blenkernel/intern/editmesh.cc
@ -19,8 +19,6 @@
 #include "BKE_DerivedMesh.hh"
 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_editmesh_cache.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_iterators.hh"
 #include "BKE_mesh_wrapper.hh"
--- a/source/blender/blenkernel/intern/editmesh_cache.cc
+++ b/source/blender/blenkernel/intern/editmesh_cache.cc
@ -14,8 +14,6 @@
 #include "BLI_math_vector.h"
 #include "BLI_span.hh"

-#include "DNA_mesh_types.h"
-
 #include "BKE_editmesh.hh"
 #include "BKE_editmesh_cache.hh" /* own include */

--- a/source/blender/blenkernel/intern/editmesh_tangent.cc
+++ b/source/blender/blenkernel/intern/editmesh_tangent.cc
@ -12,7 +12,6 @@

 #include "DNA_customdata_types.h"
 #include "DNA_defs.h"
-#include "DNA_meshdata_types.h"

 #include "BKE_customdata.hh"
 #include "BKE_editmesh.hh"
--- a/source/blender/blenkernel/intern/effect.cc
+++ b/source/blender/blenkernel/intern/effect.cc
@ -14,11 +14,9 @@

 #include "MEM_guardedalloc.h"

-#include "DNA_collection_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
@ -45,13 +43,10 @@
 #include "BKE_effect.h"
 #include "BKE_fluid.h"
 #include "BKE_global.hh"
-#include "BKE_layer.hh"
-#include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_object_types.hh"
 #include "BKE_particle.h"
-#include "BKE_scene.hh"

 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_physics.hh"
@ -160,8 +155,8 @@ static void precalculate_effector(Depsgraph *depsgraph, EffectorCache *eff)
      if (eff->ob->runtime->curve_cache->anim_path_accum_length) {
        BKE_where_on_path(
            eff->ob, 0.0, eff->guide_loc, eff->guide_dir, nullptr, &eff->guide_radius, nullptr);
-        mul_m4_v3(eff->ob->object_to_world, eff->guide_loc);
-        mul_mat3_m4_v3(eff->ob->object_to_world, eff->guide_dir);
+        mul_m4_v3(eff->ob->object_to_world().ptr(), eff->guide_loc);
+        mul_mat3_m4_v3(eff->ob->object_to_world().ptr(), eff->guide_dir);
      }
    }
  }
@ -718,8 +713,8 @@ bool get_effector_data(EffectorCache *eff,
      copy_v3_v3(efd->loc, positions[*efd->index]);
      copy_v3_v3(efd->nor, vert_normals[*efd->index]);

-      mul_m4_v3(eff->ob->object_to_world, efd->loc);
-      mul_mat3_m4_v3(eff->ob->object_to_world, efd->nor);
+      mul_m4_v3(eff->ob->object_to_world().ptr(), efd->loc);
+      mul_mat3_m4_v3(eff->ob->object_to_world().ptr(), efd->nor);

      normalize_v3(efd->nor);

@ -771,23 +766,23 @@ bool get_effector_data(EffectorCache *eff,
    const Object *ob = eff->ob;

    /* Use z-axis as normal. */
-    normalize_v3_v3(efd->nor, ob->object_to_world[2]);
+    normalize_v3_v3(efd->nor, ob->object_to_world().ptr()[2]);

    if (eff->pd && ELEM(eff->pd->shape, PFIELD_SHAPE_PLANE, PFIELD_SHAPE_LINE)) {
      float temp[3], translate[3];
-      sub_v3_v3v3(temp, point->loc, ob->object_to_world[3]);
+      sub_v3_v3v3(temp, point->loc, ob->object_to_world().location());
      project_v3_v3v3(translate, temp, efd->nor);

      /* for vortex the shape chooses between old / new force */
      if (eff->pd->forcefield == PFIELD_VORTEX || eff->pd->shape == PFIELD_SHAPE_LINE) {
-        add_v3_v3v3(efd->loc, ob->object_to_world[3], translate);
+        add_v3_v3v3(efd->loc, ob->object_to_world().location(), translate);
      }
      else { /* Normally `efd->loc` is closest point on effector XY-plane. */
        sub_v3_v3v3(efd->loc, point->loc, translate);
      }
    }
    else {
-      copy_v3_v3(efd->loc, ob->object_to_world[3]);
+      copy_v3_v3(efd->loc, ob->object_to_world().location());
    }

    zero_v3(efd->vel);
@ -812,8 +807,8 @@ bool get_effector_data(EffectorCache *eff,
    }
    else {
      /* for some effectors we need the object center every time */
-      sub_v3_v3v3(efd->vec_to_point2, point->loc, eff->ob->object_to_world[3]);
-      normalize_v3_v3(efd->nor2, eff->ob->object_to_world[2]);
+      sub_v3_v3v3(efd->vec_to_point2, point->loc, eff->ob->object_to_world().location());
+      normalize_v3_v3(efd->nor2, eff->ob->object_to_world().ptr()[2]);
    }
  }

@ -886,7 +881,7 @@ static void do_texture_effector(EffectorCache *eff,
  copy_v3_v3(tex_co, point->loc);

  if (eff->pd->flag & PFIELD_TEX_OBJECT) {
-    mul_m4_v3(eff->ob->world_to_object, tex_co);
+    mul_m4_v3(eff->ob->world_to_object().ptr(), tex_co);

    if (eff->pd->flag & PFIELD_TEX_2D) {
      tex_co[2] = 0.0f;
--- a/source/blender/blenkernel/intern/fcurve_driver.cc
+++ b/source/blender/blenkernel/intern/fcurve_driver.cc
@ -435,7 +435,7 @@ static float dvar_eval_rotDiff(const AnimationEvalContext * /*anim_eval_context*
    return 0.0f;
  }

-  float(*mat[2])[4];
+  const float(*mat[2])[4];

  /* NOTE: for now, these are all just world-space. */
  for (int i = 0; i < 2; i++) {
@ -457,7 +457,7 @@ static float dvar_eval_rotDiff(const AnimationEvalContext * /*anim_eval_context*
    }
    else {
      /* Object. */
-      mat[i] = ob->object_to_world;
+      mat[i] = ob->object_to_world().ptr();
    }
  }

@ -537,7 +537,7 @@ static float dvar_eval_locDiff(const AnimationEvalContext * /*anim_eval_context*
      else {
        /* Convert to world-space. */
        copy_v3_v3(tmp_loc, pchan->pose_head);
-        mul_m4_v3(ob->object_to_world, tmp_loc);
+        mul_m4_v3(ob->object_to_world().ptr(), tmp_loc);
      }
    }
    else {
@ -548,7 +548,7 @@ static float dvar_eval_locDiff(const AnimationEvalContext * /*anim_eval_context*
          float mat[4][4];

          /* Extract transform just like how the constraints do it! */
-          copy_m4_m4(mat, ob->object_to_world);
+          copy_m4_m4(mat, ob->object_to_world().ptr());
          BKE_constraint_mat_convertspace(
              ob, nullptr, nullptr, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL, false);

@ -562,7 +562,7 @@ static float dvar_eval_locDiff(const AnimationEvalContext * /*anim_eval_context*
      }
      else {
        /* World-space. */
-        copy_v3_v3(tmp_loc, ob->object_to_world[3]);
+        copy_v3_v3(tmp_loc, ob->object_to_world().location());
      }
    }

@ -640,7 +640,7 @@ static float dvar_eval_transChan(const AnimationEvalContext * /*anim_eval_contex
    }
    else {
      /* World-space matrix. */
-      mul_m4_m4m4(mat, ob->object_to_world, pchan->pose_mat);
+      mul_m4_m4m4(mat, ob->object_to_world().ptr(), pchan->pose_mat);
    }
  }
  else {
@ -654,7 +654,7 @@ static float dvar_eval_transChan(const AnimationEvalContext * /*anim_eval_contex
    if (dtar->flag & DTAR_FLAG_LOCALSPACE) {
      if (dtar->flag & DTAR_FLAG_LOCAL_CONSTS) {
        /* Just like how the constraints do it! */
-        copy_m4_m4(mat, ob->object_to_world);
+        copy_m4_m4(mat, ob->object_to_world().ptr());
        BKE_constraint_mat_convertspace(
            ob, nullptr, nullptr, mat, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL, false);
      }
@ -665,7 +665,7 @@ static float dvar_eval_transChan(const AnimationEvalContext * /*anim_eval_contex
    }
    else {
      /* World-space matrix - just the good-old one. */
-      copy_m4_m4(mat, ob->object_to_world);
+      copy_m4_m4(mat, ob->object_to_world().ptr());
    }
  }

--- a/source/blender/blenkernel/intern/fluid.cc
+++ b/source/blender/blenkernel/intern/fluid.cc
@ -432,7 +432,7 @@ static void manta_set_domain_from_mesh(FluidDomainSettings *fds,
  copy_v3_v3(fds->global_size, size);
  copy_v3_v3(fds->dp0, min);

-  invert_m4_m4(fds->imat, ob->object_to_world);
+  invert_m4_m4(fds->imat, ob->object_to_world().ptr());

  /* Prevent crash when initializing a plane as domain. */
  if (!init_resolution || (size[0] < FLT_EPSILON) || (size[1] < FLT_EPSILON) ||
@ -498,8 +498,8 @@ static bool fluid_modifier_init(
    zero_v3(fds->shift_f);
    add_v3_fl(fds->shift_f, 0.5f);
    zero_v3(fds->prev_loc);
-    mul_m4_v3(ob->object_to_world, fds->prev_loc);
-    copy_m4_m4(fds->obmat, ob->object_to_world);
+    mul_m4_v3(ob->object_to_world().ptr(), fds->prev_loc);
+    copy_m4_m4(fds->obmat, ob->object_to_world().ptr());

    /* Set resolutions. */
    if (fmd->domain->type == FLUID_DOMAIN_TYPE_GAS &&
@ -567,11 +567,11 @@ static int get_light(Scene *scene, ViewLayer *view_layer, float *light)
      Light *la = static_cast<Light *>(base_tmp->object->data);

      if (la->type == LA_LOCAL) {
-        copy_v3_v3(light, base_tmp->object->object_to_world[3]);
+        copy_v3_v3(light, base_tmp->object->object_to_world().location());
        return 1;
      }
      if (!found_light) {
-        copy_v3_v3(light, base_tmp->object->object_to_world[3]);
+        copy_v3_v3(light, base_tmp->object->object_to_world().location());
        found_light = 1;
      }
    }
@ -1049,7 +1049,7 @@ static void obstacles_from_mesh(Object *coll_ob,
      float co[3];

      /* Vertex position. */
-      mul_m4_v3(coll_ob->object_to_world, positions[i]);
+      mul_m4_v3(coll_ob->object_to_world().ptr(), positions[i]);
      manta_pos_to_cell(fds, positions[i]);

      /* Vertex velocity. */
@ -2111,7 +2111,7 @@ static void emit_from_mesh(
     * This is valid because the mesh is copied above. */
    for (i = 0; i < numverts; i++) {
      /* Vertex position. */
-      mul_m4_v3(flow_ob->object_to_world, positions[i]);
+      mul_m4_v3(flow_ob->object_to_world().ptr(), positions[i]);
      manta_pos_to_cell(fds, positions[i]);

      /* Vertex velocity. */
@ -2129,7 +2129,7 @@ static void emit_from_mesh(
      bb_boundInsert(bb, positions[i]);
    }
    mesh->tag_positions_changed();
-    mul_m4_v3(flow_ob->object_to_world, flow_center);
+    mul_m4_v3(flow_ob->object_to_world().ptr(), flow_center);
    manta_pos_to_cell(fds, flow_center);

    /* Set emission map.
@ -2198,7 +2198,7 @@ static void adaptive_domain_adjust(
  float frame_shift_f[3];
  float ob_loc[3] = {0};

-  mul_m4_v3(ob->object_to_world, ob_loc);
+  mul_m4_v3(ob->object_to_world().ptr(), ob_loc);

  sub_v3_v3v3(frame_shift_f, ob_loc, fds->prev_loc);
  copy_v3_v3(fds->prev_loc, ob_loc);
@ -3488,12 +3488,12 @@ static Mesh *create_smoke_geometry(FluidDomainSettings *fds, Mesh *orgmesh, Obje

    /* Calculate required shift to match domain's global position
     * it was originally simulated at (if object moves without manta step). */
-    invert_m4_m4(ob->world_to_object, ob->object_to_world);
-    mul_m4_v3(ob->object_to_world, ob_loc);
+    invert_m4_m4(ob->runtime->world_to_object.ptr(), ob->object_to_world().ptr());
+    mul_m4_v3(ob->object_to_world().ptr(), ob_loc);
    mul_m4_v3(fds->obmat, ob_cache_loc);
    sub_v3_v3v3(fds->obj_shift_f, ob_cache_loc, ob_loc);
    /* Convert shift to local space and apply to vertices. */
-    mul_mat3_m4_v3(ob->world_to_object, fds->obj_shift_f);
+    mul_mat3_m4_v3(ob->world_to_object().ptr(), fds->obj_shift_f);
    /* Apply shift to vertices. */
    for (int i = 0; i < num_verts; i++) {
      add_v3_v3(positions[i], fds->obj_shift_f);
@ -3518,8 +3518,8 @@ static int manta_step(
  bool mode_replay = (mode == FLUID_DOMAIN_CACHE_REPLAY);

  /* Update object state. */
-  invert_m4_m4(fds->imat, ob->object_to_world);
-  copy_m4_m4(fds->obmat, ob->object_to_world);
+  invert_m4_m4(fds->imat, ob->object_to_world().ptr());
+  copy_m4_m4(fds->obmat, ob->object_to_world().ptr());

  /* Gas domain might use adaptive domain. */
  if (fds->type == FLUID_DOMAIN_TYPE_GAS) {
--- a/source/blender/blenkernel/intern/geometry_component_curves.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curves.cc
@ -8,7 +8,6 @@
 #include "DNA_curve_types.h"

 #include "BKE_attribute_math.hh"
-#include "BKE_curve.hh"
 #include "BKE_curves.hh"
 #include "BKE_deform.hh"
 #include "BKE_geometry_fields.hh"
--- a/source/blender/blenkernel/intern/geometry_component_instances.cc
+++ b/source/blender/blenkernel/intern/geometry_component_instances.cc
@ -7,23 +7,16 @@
 #include "BLI_index_mask.hh"
 #include "BLI_map.hh"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_rand.hh"
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_task.hh"
 #include "BLI_vector.hh"

-#include "DNA_collection_types.h"
-
-#include "BKE_attribute_math.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"

 #include "attribute_access_intern.hh"

-#include "BLI_cpp_type_make.hh"
-
 namespace blender::bke {

 /* -------------------------------------------------------------------- */
--- a/source/blender/blenkernel/intern/geometry_component_volume.cc
+++ b/source/blender/blenkernel/intern/geometry_component_volume.cc
@ -2,8 +2,6 @@
 *
 * SPDX-License-Identifier: GPL-2.0-or-later */

-#include "DNA_volume_types.h"
-
 #include "BKE_geometry_set.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_volume.hh"
--- a/source/blender/blenkernel/intern/geometry_set_instances.cc
+++ b/source/blender/blenkernel/intern/geometry_set_instances.cc
@ -5,7 +5,6 @@
 #include "BKE_collection.hh"
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object_types.hh"
@ -130,7 +129,7 @@ void Instances::ensure_geometry_instances()
        Collection &collection = reference.collection();
        FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (&collection, object) {
          const int handle = instances->add_reference(*object);
-          instances->add_instance(handle, float4x4(object->object_to_world));
+          instances->add_instance(handle, object->object_to_world());
          float4x4 &transform = instances->transforms().last();
          transform.location() -= collection.instance_offset;
        }
--- a/Show More
+++ b/Show More