Refactor: Rename Object->obmat to Object->object_to_world

Motivation is to disambiguate on the naming level what the matrix
actually means. It is very easy to understand the meaning backwards,
especially since in Python the name goes the opposite way (it is
called `world_matrix` in the Python API).

It is important to disambiguate the naming without making developers
to look into the comment in the header file (which is also not super
clear either). Additionally, more clear naming facilitates the unit
verification (or, in this case, space validation) when reading an
expression.

This patch calls the matrix `object_to_world` which makes it clear
from the local code what is it exactly going on. This is only done
on DNA level, and a lot of local variables still follow the old
naming.

A DNA rename is setup in a way that there is no change on the file
level, so there should be no regressions at all.

The possibility is to add `_matrix` or `_mat` suffix to the name
to make it explicit that it is a matrix. Although, not sure if it
really helps the readability, or is it something redundant.

Differential Revision: https://developer.blender.org/D16328

24 files changed, 162 insertions, 153 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 942ab5502c7..eb111610706 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -403,7 +403,7 @@ static bool eevee_lightprobes_culling_test(Object *ob)
       const float max[3] = {1.0f, 1.0f, 1.0f};
       BKE_boundbox_init_from_minmax(&bbox, min, max);
 
-      copy_m4_m4(tmp, ob->obmat);
+      copy_m4_m4(tmp, ob->object_to_world);
       normalize_v3(tmp[2]);
       mul_v3_fl(tmp[2], probe->distinf);
 
@@ -445,7 +445,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata
     /* Debug Display */
     DRWCallBuffer *grp = vedata->stl->g_data->planar_display_shgrp;
     if (grp && (probe->flag & LIGHTPROBE_FLAG_SHOW_DATA)) {
-      DRW_buffer_add_entry(grp, &pinfo->num_planar, ob->obmat);
+      DRW_buffer_add_entry(grp, &pinfo->num_planar, ob->object_to_world);
     }
 
     pinfo->num_planar++;
@@ -488,30 +488,30 @@ void EEVEE_lightprobes_grid_data_from_object(Object *ob, EEVEE_LightGrid *egrid,
   mul_v3_v3fl(half_cell_dim, cell_dim, 0.5f);
 
   /* Matrix converting world space to cell ranges. */
-  invert_m4_m4(egrid->mat, ob->obmat);
+  invert_m4_m4(egrid->mat, ob->object_to_world);
 
   /* First cell. */
   copy_v3_fl(egrid->corner, -1.0f);
   add_v3_v3(egrid->corner, half_cell_dim);
-  mul_m4_v3(ob->obmat, egrid->corner);
+  mul_m4_v3(ob->object_to_world, egrid->corner);
 
   /* Opposite neighbor cell. */
   copy_v3_fl3(egrid->increment_x, cell_dim[0], 0.0f, 0.0f);
   add_v3_v3(egrid->increment_x, half_cell_dim);
   add_v3_fl(egrid->increment_x, -1.0f);
-  mul_m4_v3(ob->obmat, egrid->increment_x);
+  mul_m4_v3(ob->object_to_world, egrid->increment_x);
   sub_v3_v3(egrid->increment_x, egrid->corner);
 
   copy_v3_fl3(egrid->increment_y, 0.0f, cell_dim[1], 0.0f);
   add_v3_v3(egrid->increment_y, half_cell_dim);
   add_v3_fl(egrid->increment_y, -1.0f);
-  mul_m4_v3(ob->obmat, egrid->increment_y);
+  mul_m4_v3(ob->object_to_world, egrid->increment_y);
   sub_v3_v3(egrid->increment_y, egrid->corner);
 
   copy_v3_fl3(egrid->increment_z, 0.0f, 0.0f, cell_dim[2]);
   add_v3_v3(egrid->increment_z, half_cell_dim);
   add_v3_fl(egrid->increment_z, -1.0f);
-  mul_m4_v3(ob->obmat, egrid->increment_z);
+  mul_m4_v3(ob->object_to_world, egrid->increment_z);
   sub_v3_v3(egrid->increment_z, egrid->corner);
 
   /* Visibility bias */
@@ -527,7 +527,7 @@ void EEVEE_lightprobes_cube_data_from_object(Object *ob, EEVEE_LightProbe *eprob
   LightProbe *probe = (LightProbe *)ob->data;
 
   /* Update transforms */
-  copy_v3_v3(eprobe->position, ob->obmat[3]);
+  copy_v3_v3(eprobe->position, ob->object_to_world[3]);
 
   /* Attenuation */
   eprobe->attenuation_type = probe->attenuation_type;
@@ -535,7 +535,7 @@ void EEVEE_lightprobes_cube_data_from_object(Object *ob, EEVEE_LightProbe *eprob
 
   unit_m4(eprobe->attenuationmat);
   scale_m4_fl(eprobe->attenuationmat, probe->distinf);
-  mul_m4_m4m4(eprobe->attenuationmat, ob->obmat, eprobe->attenuationmat);
+  mul_m4_m4m4(eprobe->attenuationmat, ob->object_to_world, eprobe->attenuationmat);
   invert_m4(eprobe->attenuationmat);
 
   /* Parallax */
@@ -550,7 +550,7 @@ void EEVEE_lightprobes_cube_data_from_object(Object *ob, EEVEE_LightProbe *eprob
     scale_m4_fl(eprobe->parallaxmat, probe->distinf);
   }
 
-  mul_m4_m4m4(eprobe->parallaxmat, ob->obmat, eprobe->parallaxmat);
+  mul_m4_m4m4(eprobe->parallaxmat, ob->object_to_world, eprobe->parallaxmat);
   invert_m4(eprobe->parallaxmat);
 }
 
@@ -566,8 +566,8 @@ void EEVEE_lightprobes_planar_data_from_object(Object *ob,
   vis_test->cached = false;
 
   /* Computing mtx : matrix that mirror position around object's XY plane. */
-  normalize_m4_m4(normat, ob->obmat); /* object > world */
-  invert_m4_m4(imat, normat);         /* world > object */
+  normalize_m4_m4(normat, ob->object_to_world); /* object > world */
+  invert_m4_m4(imat, normat);                   /* world > object */
   /* XY reflection plane */
   imat[0][2] = -imat[0][2];
   imat[1][2] = -imat[1][2];
@@ -576,38 +576,38 @@ void EEVEE_lightprobes_planar_data_from_object(Object *ob,
   mul_m4_m4m4(eplanar->mtx, normat, imat); /* world > object > mirrored obj > world */
 
   /* Compute clip plane equation / normal. */
-  copy_v3_v3(eplanar->plane_equation, ob->obmat[2]);
+  copy_v3_v3(eplanar->plane_equation, ob->object_to_world[2]);
   normalize_v3(eplanar->plane_equation); /* plane normal */
-  eplanar->plane_equation[3] = -dot_v3v3(eplanar->plane_equation, ob->obmat[3]);
+  eplanar->plane_equation[3] = -dot_v3v3(eplanar->plane_equation, ob->object_to_world[3]);
   eplanar->clipsta = probe->clipsta;
 
   /* Compute XY clip planes. */
-  normalize_v3_v3(eplanar->clip_vec_x, ob->obmat[0]);
-  normalize_v3_v3(eplanar->clip_vec_y, ob->obmat[1]);
+  normalize_v3_v3(eplanar->clip_vec_x, ob->object_to_world[0]);
+  normalize_v3_v3(eplanar->clip_vec_y, ob->object_to_world[1]);
 
   float vec[3] = {0.0f, 0.0f, 0.0f};
   vec[0] = 1.0f;
   vec[1] = 0.0f;
   vec[2] = 0.0f;
-  mul_m4_v3(ob->obmat, vec); /* Point on the edge */
+  mul_m4_v3(ob->object_to_world, vec); /* Point on the edge */
   eplanar->clip_edge_x_pos = dot_v3v3(eplanar->clip_vec_x, vec);
 
   vec[0] = 0.0f;
   vec[1] = 1.0f;
   vec[2] = 0.0f;
-  mul_m4_v3(ob->obmat, vec); /* Point on the edge */
+  mul_m4_v3(ob->object_to_world, vec); /* Point on the edge */
   eplanar->clip_edge_y_pos = dot_v3v3(eplanar->clip_vec_y, vec);
 
   vec[0] = -1.0f;
   vec[1] = 0.0f;
   vec[2] = 0.0f;
-  mul_m4_v3(ob->obmat, vec); /* Point on the edge */
+  mul_m4_v3(ob->object_to_world, vec); /* Point on the edge */
   eplanar->clip_edge_x_neg = dot_v3v3(eplanar->clip_vec_x, vec);
 
   vec[0] = 0.0f;
   vec[1] = -1.0f;
   vec[2] = 0.0f;
-  mul_m4_v3(ob->obmat, vec); /* Point on the edge */
+  mul_m4_v3(ob->object_to_world, vec); /* Point on the edge */
   eplanar->clip_edge_y_neg = dot_v3v3(eplanar->clip_vec_y, vec);
 
   /* Facing factors */
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index 312305a31f7..f8250f9520d 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -132,7 +132,7 @@ static void eevee_light_setup(Object *ob, EEVEE_Light *evli)
   const float light_threshold = draw_ctx->scene->eevee.light_threshold;
 
   /* Position */
-  copy_v3_v3(evli->position, ob->obmat[3]);
+  copy_v3_v3(evli->position, ob->object_to_world[3]);
 
   /* Color */
   copy_v3_v3(evli->color, &la->r);
@@ -153,7 +153,7 @@ static void eevee_light_setup(Object *ob, EEVEE_Light *evli)
   evli->invsqrdist_volume = 1.0f / max_ff(1e-4f, square_f(att_radius_volume));
 
   /* Vectors */
-  normalize_m4_m4_ex(mat, ob->obmat, scale);
+  normalize_m4_m4_ex(mat, ob->object_to_world, scale);
   copy_v3_v3(evli->forwardvec, mat[2]);
   normalize_v3(evli->forwardvec);
   negate_v3(evli->forwardvec);
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index a3ca19c88e1..9f7fb1c154c 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -292,7 +292,7 @@ void EEVEE_motion_blur_curves_cache_populate(EEVEE_ViewLayerData *UNUSED(sldata)
 
   int mb_step = effects->motion_blur_step;
   /* Store transform. */
-  copy_m4_m4(mb_data->obmat[mb_step], ob->obmat);
+  copy_m4_m4(mb_data->obmat[mb_step], ob->object_to_world);
 
   EEVEE_HairMotionData *mb_curves = EEVEE_motion_blur_curves_data_get(mb_data);
 
@@ -362,7 +362,7 @@ void EEVEE_motion_blur_cache_populate(EEVEE_ViewLayerData *UNUSED(sldata),
   if (mb_data) {
     int mb_step = effects->motion_blur_step;
     /* Store transform. */
-    copy_m4_m4(mb_data->obmat[mb_step], ob->obmat);
+    copy_m4_m4(mb_data->obmat[mb_step], ob->object_to_world);
 
     EEVEE_GeometryMotionData *mb_geom = EEVEE_motion_blur_geometry_data_get(mb_data);
 
diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c
index 9e571b1d15b..1cf3c7c6da1 100644
--- a/source/blender/draw/engines/eevee/eevee_shadows.c
+++ b/source/blender/draw/engines/eevee/eevee_shadows.c
@@ -153,7 +153,7 @@ void EEVEE_shadows_caster_register(EEVEE_ViewLayerData *sldata, Object *ob)
   for (int i = 0; i < 8; i++) {
     float vec[3];
     copy_v3_v3(vec, bb->vec[i]);
-    mul_m4_v3(ob->obmat, vec);
+    mul_m4_v3(ob->object_to_world, vec);
     minmax_v3v3_v3(min, max, vec);
   }
 
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 05b2bafdb3a..872696a8b7c 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -299,7 +299,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
   }
 
   float size[3];
-  mat4_to_size(size, ob->obmat);
+  mat4_to_size(size, ob->object_to_world);
   /* Check if any of the axes have 0 length. (see T69070) */
   const float epsilon = 1e-8f;
   if ((size[0] < epsilon) || (size[1] < epsilon) || (size[2] < epsilon)) {
diff --git a/source/blender/draw/engines/eevee_next/eevee_light.cc b/source/blender/draw/engines/eevee_next/eevee_light.cc
index 8a5de15229d..aa8268dbaa7 100644
--- a/source/blender/draw/engines/eevee_next/eevee_light.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_light.cc
@@ -58,7 +58,7 @@ void Light::sync(/* ShadowModule &shadows , */ const Object *ob, float threshold
   this->influence_radius_invsqr_volume = 1.0f / square_f(max_ff(influence_radius_volume, 1e-8f));
 
   this->color = float3(&la->r) * la->energy;
-  normalize_m4_m4_ex(this->object_mat.ptr(), ob->obmat, scale);
+  normalize_m4_m4_ex(this->object_mat.ptr(), ob->object_to_world, scale);
   /* Make sure we have consistent handedness (in case of negatively scaled Z axis). */
   float3 cross = math::cross(float3(this->_right), float3(this->_up));
   if (math::dot(cross, float3(this->_back)) < 0.0f) {
diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
index e6b37b4ad47..0242f732f27 100644
--- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
@@ -182,7 +182,7 @@ PassMain::Sub *ForwardPipeline::prepass_transparent_add(const Object *ob,
   if (blender_mat->blend_flag & MA_BL_CULL_BACKFACE) {
     state |= DRW_STATE_CULL_BACK;
   }
-  float sorting_value = math::dot(float3(ob->obmat[3]), camera_forward_);
+  float sorting_value = math::dot(float3(ob->object_to_world[3]), camera_forward_);
   PassMain::Sub *pass = &transparent_ps_.sub(GPU_material_get_name(gpumat), sorting_value);
   pass->state_set(state);
   pass->material_set(*inst_.manager, gpumat);
@@ -197,7 +197,7 @@ PassMain::Sub *ForwardPipeline::material_transparent_add(const Object *ob,
   if (blender_mat->blend_flag & MA_BL_CULL_BACKFACE) {
     state |= DRW_STATE_CULL_BACK;
   }
-  float sorting_value = math::dot(float3(ob->obmat[3]), camera_forward_);
+  float sorting_value = math::dot(float3(ob->object_to_world[3]), camera_forward_);
   PassMain::Sub *pass = &transparent_ps_.sub(GPU_material_get_name(gpumat), sorting_value);
   pass->state_set(state);
   pass->material_set(*inst_.manager, gpumat);
diff --git a/source/blender/draw/engines/eevee_next/eevee_velocity.cc b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
index b9a78e8547e..52401c8003e 100644
--- a/source/blender/draw/engines/eevee_next/eevee_velocity.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
@@ -106,16 +106,16 @@ bool VelocityModule::step_object_sync(Object *ob,
   vel.obj.ofs[step_] = object_steps_usage[step_]++;
   vel.obj.resource_id = resource_handle.resource_index();
   vel.id = (ID *)ob->data;
-  object_steps[step_]->get_or_resize(vel.obj.ofs[step_]) = ob->obmat;
+  object_steps[step_]->get_or_resize(vel.obj.ofs[step_]) = ob->object_to_world;
   if (step_ == STEP_CURRENT) {
     /* Replace invalid steps. Can happen if object was hidden in one of those steps. */
     if (vel.obj.ofs[STEP_PREVIOUS] == -1) {
       vel.obj.ofs[STEP_PREVIOUS] = object_steps_usage[STEP_PREVIOUS]++;
-      object_steps[STEP_PREVIOUS]->get_or_resize(vel.obj.ofs[STEP_PREVIOUS]) = ob->obmat;
+      object_steps[STEP_PREVIOUS]->get_or_resize(vel.obj.ofs[STEP_PREVIOUS]) = ob->object_to_world;
     }
     if (vel.obj.ofs[STEP_NEXT] == -1) {
       vel.obj.ofs[STEP_NEXT] = object_steps_usage[STEP_NEXT]++;
-      object_steps[STEP_NEXT]->get_or_resize(vel.obj.ofs[STEP_NEXT]) = ob->obmat;
+      object_steps[STEP_NEXT]->get_or_resize(vel.obj.ofs[STEP_NEXT]) = ob->object_to_world;
     }
   }
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index a41918e7e0d..06bf531cded 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -39,9 +39,9 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
 
   tgp_ob->layers.first = tgp_ob->layers.last = NULL;
   tgp_ob->vfx.first = tgp_ob->vfx.last = NULL;
-  tgp_ob->camera_z = dot_v3v3(pd->camera_z_axis, ob->obmat[3]);
+  tgp_ob->camera_z = dot_v3v3(pd->camera_z_axis, ob->object_to_world[3]);
   tgp_ob->is_drawmode3d = (gpd->draw_mode == GP_DRAWMODE_3D) || pd->draw_depth_only;
-  tgp_ob->object_scale = mat4_to_scale(ob->obmat);
+  tgp_ob->object_scale = mat4_to_scale(ob->object_to_world);
 
   /* Check if any material with holdout flag enabled. */
   tgp_ob->do_mat_holdout = false;
@@ -71,7 +71,7 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
   add_v3_fl(size, 1e-8f);
   rescale_m4(mat, size);
   /* BBox space to World. */
-  mul_m4_m4m4(mat, ob->obmat, mat);
+  mul_m4_m4m4(mat, ob->object_to_world, mat);
   if (DRW_view_is_persp_get(NULL)) {
     /* BBox center to camera vector. */
     sub_v3_v3v3(tgp_ob->plane_normal, pd->camera_pos, mat[3]);
@@ -96,9 +96,9 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
   unit_m4(tgp_ob->plane_mat);
   copy_v3_v3(tgp_ob->plane_mat[2], tgp_ob->plane_normal);
   orthogonalize_m4(tgp_ob->plane_mat, 2);
-  mul_mat3_m4_v3(ob->obmat, size);
+  mul_mat3_m4_v3(ob->object_to_world, size);
   float radius = len_v3(size);
-  mul_m4_v3(ob->obmat, center);
+  mul_m4_v3(ob->object_to_world, center);
   rescale_m4(tgp_ob->plane_mat, (float[3]){radius, radius, radius});
   copy_v3_v3(tgp_ob->plane_mat[3], center);
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
index e54ac99a888..07b72c97875 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
@@ -387,20 +387,20 @@ void gpencil_light_pool_populate(GPENCIL_LightPool *lightpool, Object *ob)
   }
   else if (la->type == LA_AREA) {
     /* Simulate area lights using a spot light. */
-    normalize_m4_m4(mat, ob->obmat);
+    normalize_m4_m4(mat, ob->object_to_world);
     invert_m4(mat);
     gp_light->type = GP_LIGHT_TYPE_SPOT;
     gp_light->spot_size = cosf(M_PI_2);
     gp_light->spot_blend = (1.0f - gp_light->spot_size) * 1.0f;
   }
   else if (la->type == LA_SUN) {
-    normalize_v3_v3(gp_light->forward, ob->obmat[2]);
+    normalize_v3_v3(gp_light->forward, ob->object_to_world[2]);
     gp_light->type = GP_LIGHT_TYPE_SUN;
   }
   else {
     gp_light->type = GP_LIGHT_TYPE_POINT;
   }
-  copy_v4_v4(gp_light->position, ob->obmat[3]);
+  copy_v4_v4(gp_light->position, ob->object_to_world[3]);
   copy_v3_v3(gp_light->color, &la->r);
   mul_v3_fl(gp_light->color, la->energy * light_power_get(la));
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index a7d8570dbaa..9b1129e77be 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -96,7 +96,7 @@ static void gpencil_vfx_blur(BlurShaderFxData *fx, Object *ob, gpIterVfxData *it
   float winmat[4][4], persmat[4][4];
   float blur_size[2] = {fx->radius[0], fx->radius[1]};
   DRW_view_persmat_get(NULL, persmat, false);
-  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->obmat[3]));
+  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->object_to_world[3]));
 
   if (fx->flag & FX_BLUR_DOF_MODE) {
     /* Compute circle of confusion size. */
@@ -108,7 +108,7 @@ static void gpencil_vfx_blur(BlurShaderFxData *fx, Object *ob, gpIterVfxData *it
     DRW_view_winmat_get(NULL, winmat, false);
     const float *vp_size = DRW_viewport_size_get();
     float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-    float scale = mat4_to_scale(ob->obmat);
+    float scale = mat4_to_scale(ob->object_to_world);
     float distance_factor = world_pixel_scale * scale * winmat[1][1] * vp_size[1] / w;
     mul_v2_fl(blur_size, distance_factor);
   }
@@ -175,11 +175,11 @@ static void gpencil_vfx_rim(RimShaderFxData *fx, Object *ob, gpIterVfxData *iter
   const float *vp_size = DRW_viewport_size_get();
   const float *vp_size_inv = DRW_viewport_invert_size_get();
 
-  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->obmat[3]));
+  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->object_to_world[3]));
 
   /* Modify by distance to camera and object scale. */
   float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-  float scale = mat4_to_scale(ob->obmat);
+  float scale = mat4_to_scale(ob->object_to_world);
   float distance_factor = (world_pixel_scale * scale * winmat[1][1] * vp_size[1]) / w;
   mul_v2_fl(offset, distance_factor);
   mul_v2_v2(offset, vp_size_inv);
@@ -248,8 +248,8 @@ static void gpencil_vfx_pixelize(PixelShaderFxData *fx, Object *ob, gpIterVfxDat
   mul_v2_v2(pixel_size, vp_size_inv);
 
   /* Fixed pixelisation center from object center. */
-  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->obmat[3]));
-  mul_v3_m4v3(ob_center, persmat, ob->obmat[3]);
+  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->object_to_world[3]));
+  mul_v3_m4v3(ob_center, persmat, ob->object_to_world[3]);
   mul_v3_fl(ob_center, 1.0f / w);
 
   const bool use_antialiasing = ((fx->flag & FX_PIXEL_FILTER_NEAREST) == 0);
@@ -260,7 +260,7 @@ static void gpencil_vfx_pixelize(PixelShaderFxData *fx, Object *ob, gpIterVfxDat
 
   /* Modify by distance to camera and object scale. */
   float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-  float scale = mat4_to_scale(ob->obmat);
+  float scale = mat4_to_scale(ob->object_to_world);
   mul_v2_fl(pixel_size, (world_pixel_scale * scale * winmat[1][1] * vp_size[1]) / w);
 
   /* Center to texel */
@@ -310,7 +310,9 @@ static void gpencil_vfx_shadow(ShadowShaderFxData *fx, Object *ob, gpIterVfxData
   const float *vp_size_inv = DRW_viewport_invert_size_get();
   const float ratio = vp_size_inv[1] / vp_size_inv[0];
 
-  copy_v3_v3(rot_center, (use_obj_pivot && fx->object) ? fx->object->obmat[3] : ob->obmat[3]);
+  copy_v3_v3(rot_center,
+             (use_obj_pivot && fx->object) ? fx->object->object_to_world[3] :
+                                             ob->object_to_world[3]);
 
   const float w = fabsf(mul_project_m4_v3_zfac(persmat, rot_center));
   mul_v3_m4v3(rot_center, persmat, rot_center);
@@ -318,7 +320,7 @@ static void gpencil_vfx_shadow(ShadowShaderFxData *fx, Object *ob, gpIterVfxData
 
   /* Modify by distance to camera and object scale. */
   float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-  float scale = mat4_to_scale(ob->obmat);
+  float scale = mat4_to_scale(ob->object_to_world);
   float distance_factor = (world_pixel_scale * scale * winmat[1][1] * vp_size[1]) / w;
   mul_v2_fl(offset, distance_factor);
   mul_v2_v2(offset, vp_size_inv);
@@ -485,13 +487,13 @@ static void gpencil_vfx_wave(WaveShaderFxData *fx, Object *ob, gpIterVfxData *it
   const float *vp_size = DRW_viewport_size_get();
   const float *vp_size_inv = DRW_viewport_invert_size_get();
 
-  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->obmat[3]));
-  mul_v3_m4v3(wave_center, persmat, ob->obmat[3]);
+  const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->object_to_world[3]));
+  mul_v3_m4v3(wave_center, persmat, ob->object_to_world[3]);
   mul_v3_fl(wave_center, 1.0f / w);
 
   /* Modify by distance to camera and object scale. */
   float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-  float scale = mat4_to_scale(ob->obmat);
+  float scale = mat4_to_scale(ob->object_to_world);
   float distance_factor = (world_pixel_scale * scale * winmat[1][1] * vp_size[1]) / w;
 
   wave_center[0] = wave_center[0] * 0.5f + 0.5f;
@@ -542,7 +544,7 @@ static void gpencil_vfx_swirl(SwirlShaderFxData *fx, Object *UNUSED(ob), gpIterV
   DRW_view_persmat_get(NULL, persmat, false);
   const float *vp_size = DRW_viewport_size_get();
 
-  copy_v3_v3(swirl_center, fx->object->obmat[3]);
+  copy_v3_v3(swirl_center, fx->object->object_to_world[3]);
 
   const float w = fabsf(mul_project_m4_v3_zfac(persmat, swirl_center));
   mul_v3_m4v3(swirl_center, persmat, swirl_center);
@@ -550,7 +552,7 @@ static void gpencil_vfx_swirl(SwirlShaderFxData *fx, Object *UNUSED(ob), gpIterV
 
   /* Modify by distance to camera and object scale. */
   float world_pixel_scale = 1.0f / GPENCIL_PIXEL_FACTOR;
-  float scale = mat4_to_scale(fx->object->obmat);
+  float scale = mat4_to_scale(fx->object->object_to_world);
   float distance_factor = (world_pixel_scale * scale * winmat[1][1] * vp_size[1]) / w;
 
   mul_v2_fl(swirl_center, 0.5f);
diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc
index 0cf9d91804a..8c9587e7a9a 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.cc
+++ b/source/blender/draw/engines/overlay/overlay_armature.cc
@@ -441,7 +441,7 @@ static void drw_shgroup_bone_octahedral(ArmatureDrawContext *ctx,
                                         const float outline_color[4])
 {
   BoneInstanceData inst_data;
-  mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+  mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
   if (ctx->solid) {
     OVERLAY_bone_instance_data_set_color(&inst_data, bone_color);
     OVERLAY_bone_instance_data_set_color_hint(&inst_data, hint_color);
@@ -461,7 +461,7 @@ static void drw_shgroup_bone_box(ArmatureDrawContext *ctx,
                                  const float outline_color[4])
 {
   BoneInstanceData inst_data;
-  mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+  mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
   if (ctx->solid) {
     OVERLAY_bone_instance_data_set_color(&inst_data, bone_color);
     OVERLAY_bone_instance_data_set_color_hint(&inst_data, hint_color);
@@ -479,9 +479,9 @@ static void drw_shgroup_bone_wire(ArmatureDrawContext *ctx,
                                   const float color[4])
 {
   float head[3], tail[3];
-  mul_v3_m4v3(head, ctx->ob->obmat, bone_mat[3]);
+  mul_v3_m4v3(head, ctx->ob->object_to_world, bone_mat[3]);
   add_v3_v3v3(tail, bone_mat[3], bone_mat[1]);
-  mul_m4_v3(ctx->ob->obmat, tail);
+  mul_m4_v3(ctx->ob->object_to_world, tail);
 
   DRW_buffer_add_entry(ctx->wire, head, color);
   DRW_buffer_add_entry(ctx->wire, tail, color);
@@ -496,9 +496,9 @@ static void drw_shgroup_bone_stick(ArmatureDrawContext *ctx,
                                    const float col_tail[4])
 {
   float head[3], tail[3];
-  mul_v3_m4v3(head, ctx->ob->obmat, bone_mat[3]);
+  mul_v3_m4v3(head, ctx->ob->object_to_world, bone_mat[3]);
   add_v3_v3v3(tail, bone_mat[3], bone_mat[1]);
-  mul_m4_v3(ctx->ob->obmat, tail);
+  mul_m4_v3(ctx->ob->object_to_world, tail);
 
   DRW_buffer_add_entry(ctx->stick, head, tail, col_wire, col_bone, col_head, col_tail);
 }
@@ -517,11 +517,11 @@ static void drw_shgroup_bone_envelope_distance(ArmatureDrawContext *ctx,
     mul_m4_v4(bone_mat, head_sph);
     mul_m4_v4(bone_mat, tail_sph);
     mul_m4_v4(bone_mat, xaxis);
-    mul_m4_v4(ctx->ob->obmat, head_sph);
-    mul_m4_v4(ctx->ob->obmat, tail_sph);
-    mul_m4_v4(ctx->ob->obmat, xaxis);
+    mul_m4_v4(ctx->ob->object_to_world, head_sph);
+    mul_m4_v4(ctx->ob->object_to_world, tail_sph);
+    mul_m4_v4(ctx->ob->object_to_world, xaxis);
     sub_v3_v3(xaxis, head_sph);
-    float obscale = mat4_to_scale(ctx->ob->obmat);
+    float obscale = mat4_to_scale(ctx->ob->object_to_world);
     head_sph[3] = *radius_head * obscale;
     head_sph[3] += *distance * obscale;
     tail_sph[3] = *radius_tail * obscale;
@@ -544,10 +544,10 @@ static void drw_shgroup_bone_envelope(ArmatureDrawContext *ctx,
   mul_m4_v4(bone_mat, head_sph);
   mul_m4_v4(bone_mat, tail_sph);
   mul_m4_v4(bone_mat, xaxis);
-  mul_m4_v4(ctx->ob->obmat, head_sph);
-  mul_m4_v4(ctx->ob->obmat, tail_sph);
-  mul_m4_v4(ctx->ob->obmat, xaxis);
-  float obscale = mat4_to_scale(ctx->ob->obmat);
+  mul_m4_v4(ctx->ob->object_to_world, head_sph);
+  mul_m4_v4(ctx->ob->object_to_world, tail_sph);
+  mul_m4_v4(ctx->ob->object_to_world, xaxis);
+  float obscale = mat4_to_scale(ctx->ob->object_to_world);
   head_sph[3] = *radius_head * obscale;
   tail_sph[3] = *radius_tail * obscale;
 
@@ -651,7 +651,7 @@ static void drw_shgroup_bone_custom_solid_mesh(ArmatureDrawContext *ctx,
   DRWCallBuffer *buf;
 
   if (surf || edges || ledges) {
-    mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+    mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
   }
 
   if (surf && ctx->custom_solid) {
@@ -692,7 +692,7 @@ static void drw_shgroup_bone_custom_mesh_wire(ArmatureDrawContext *ctx,
   if (geom) {
     DRWCallBuffer *buf = custom_bone_instance_shgroup(ctx, ctx->custom_wire, geom);
     BoneInstanceData inst_data;
-    mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+    mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
     OVERLAY_bone_instance_data_set_color_hint(&inst_data, color);
     OVERLAY_bone_instance_data_set_color(&inst_data, color);
     DRW_buffer_add_entry_struct(buf, inst_data.mat);
@@ -724,7 +724,7 @@ static void drw_shgroup_custom_bone_curve(ArmatureDrawContext *ctx,
 
   if (ledges) {
     BoneInstanceData inst_data;
-    mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+    mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
 
     DRWCallBuffer *buf = custom_bone_instance_shgroup(ctx, ctx->custom_wire, ledges);
     OVERLAY_bone_instance_data_set_color_hint(&inst_data, outline_color);
@@ -785,7 +785,7 @@ static void drw_shgroup_bone_custom_empty(ArmatureDrawContext *ctx,
 {
   const float final_color[4] = {color[0], color[1], color[2], 1.0f};
   float mat[4][4];
-  mul_m4_m4m4(mat, ctx->ob->obmat, bone_mat);
+  mul_m4_m4m4(mat, ctx->ob->object_to_world, bone_mat);
 
   switch (custom->empty_drawtype) {
     case OB_PLAINAXES:
@@ -811,7 +811,7 @@ static void drw_shgroup_bone_point(ArmatureDrawContext *ctx,
                                    const float outline_color[4])
 {
   BoneInstanceData inst_data;
-  mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, bone_mat);
+  mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, bone_mat);
   if (ctx->point_solid) {
     OVERLAY_bone_instance_data_set_color(&inst_data, bone_color);
     OVERLAY_bone_instance_data_set_color_hint(&inst_data, hint_color);
@@ -829,7 +829,7 @@ static void drw_shgroup_bone_axes(ArmatureDrawContext *ctx,
                                   const float color[4])
 {
   float mat[4][4];
-  mul_m4_m4m4(mat, ctx->ob->obmat, bone_mat);
+  mul_m4_m4m4(mat, ctx->ob->object_to_world, bone_mat);
   /* Move to bone tail. */
   add_v3_v3(mat[3], mat[1]);
   OVERLAY_empty_shape(ctx->extras, mat, 0.25f, OB_ARROWS, color);
@@ -842,8 +842,8 @@ static void drw_shgroup_bone_relationship_lines_ex(ArmatureDrawContext *ctx,
                                                    const float color[4])
 {
   float s[3], e[3];
-  mul_v3_m4v3(s, ctx->ob->obmat, start);
-  mul_v3_m4v3(e, ctx->ob->obmat, end);
+  mul_v3_m4v3(s, ctx->ob->object_to_world, start);
+  mul_v3_m4v3(e, ctx->ob->object_to_world, end);
   /* reverse order to have less stipple overlap */
   OVERLAY_extra_line_dashed(ctx->extras, s, e, color);
 }
@@ -1909,7 +1909,7 @@ static void draw_bone_degrees_of_freedom(ArmatureDrawContext *ctx, bPoseChannel
   mul_m4_m4m4(posetrans, posetrans, tmp);
 
   /* into world space. */
-  mul_m4_m4m4(inst_data.mat, ctx->ob->obmat, posetrans);
+  mul_m4_m4m4(inst_data.mat, ctx->ob->object_to_world, posetrans);
 
   if ((pchan->ikflag & BONE_IK_XLIMIT) && (pchan->ikflag & BONE_IK_ZLIMIT)) {
     bone_instance_data_set_angle_minmax(
@@ -2079,7 +2079,7 @@ static void draw_bone_name(ArmatureDrawContext *ctx,
   float *head = pchan ? pchan->pose_head : eBone->head;
   float *tail = pchan ? pchan->pose_tail : eBone->tail;
   mid_v3_v3v3(vec, head, tail);
-  mul_m4_v3(ctx->ob->obmat, vec);
+  mul_m4_v3(ctx->ob->object_to_world, vec);
 
   DRW_text_cache_add(dt,
                      vec,
@@ -2177,7 +2177,8 @@ static bool pchan_culling_test_envelope(const DRWView *view,
   BoundSphere bsphere;
   pchan_culling_calc_bsphere(ob, pchan, &bsphere);
   bsphere.radius += max_ff(pchan->bone->rad_head, pchan->bone->rad_tail) *
-                    mat4_to_size_max_axis(ob->obmat) * mat4_to_size_max_axis(pchan->disp_mat);
+                    mat4_to_size_max_axis(ob->object_to_world) *
+                    mat4_to_size_max_axis(pchan->disp_mat);
   return DRW_culling_sphere_test(view, &bsphere);
 }
 
@@ -2188,13 +2189,13 @@ static bool pchan_culling_test_bbone(const DRWView *view,
   const bArmature *arm = static_cast<bArmature *>(ob->data);
   BLI_assert(arm->drawtype == ARM_B_BONE);
   UNUSED_VARS_NDEBUG(arm);
-  const float ob_scale = mat4_to_size_max_axis(ob->obmat);
+  const float ob_scale = mat4_to_size_max_axis(ob->object_to_world);
   const Mat4 *bbones_mat = (const Mat4 *)pchan->draw_data->bbone_matrix;
   for (int i = pchan->bone->segments; i--; bbones_mat++) {
     BoundSphere bsphere;
     float size[3];
     mat4_to_size(size, bbones_mat->mat);
-    mul_v3_m4v3(bsphere.center, ob->obmat, bbones_mat->mat[3]);
+    mul_v3_m4v3(bsphere.center, ob->object_to_world, bbones_mat->mat[3]);
     bsphere.radius = len_v3(size) * ob_scale;
     if (DRW_culling_sphere_test(view, &bsphere)) {
       return true;
diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.cc b/source/blender/draw/engines/overlay/overlay_edit_text.cc
index ebadaa530e4..d1bca705ae6 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_text.cc
+++ b/source/blender/draw/engines/overlay/overlay_edit_text.cc
@@ -119,7 +119,7 @@ static void edit_text_cache_populate_select(OVERLAY_Data *vedata, Object *ob)
       add_v2_v2(box[3], &sb->x);
     }
     v2_quad_corners_to_mat4(box, final_mat);
-    mul_m4_m4m4(final_mat, ob->obmat, final_mat);
+    mul_m4_m4m4(final_mat, ob->object_to_world, final_mat);
 
     DRW_shgroup_call_obmat(pd->edit_text_selection_grp, geom, final_mat);
   }
@@ -134,7 +134,7 @@ static void edit_text_cache_populate_cursor(OVERLAY_Data *vedata, Object *ob)
   float mat[4][4];
 
   v2_quad_corners_to_mat4(cursor, mat);
-  mul_m4_m4m4(mat, ob->obmat, mat);
+  mul_m4_m4m4(mat, ob->object_to_world, mat);
 
   struct GPUBatch *geom = DRW_cache_quad_get();
   DRW_shgroup_call_obmat(pd->edit_text_cursor_grp, geom, mat);
@@ -162,7 +162,7 @@ static void edit_text_cache_populate_boxes(OVERLAY_Data *vedata, Object *ob)
       vecs[3][1] -= tb->h;
 
       for (int j = 0; j < 4; j++) {
-        mul_v3_m4v3(vecs[j], ob->obmat, vecs[j]);
+        mul_v3_m4v3(vecs[j], ob->object_to_world, vecs[j]);
       }
       for (int j = 0; j < 4; j++) {
         OVERLAY_extra_line_dashed(cb, vecs[j], vecs[(j + 1) % 4], color);
diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc
index 114123ab36e..27afe49a17b 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.cc
+++ b/source/blender/draw/engines/overlay/overlay_extra.cc
@@ -331,7 +331,7 @@ void OVERLAY_empty_cache_populate(OVERLAY_Data *vedata, Object *ob)
     case OB_EMPTY_CONE:
     case OB_ARROWS:
       DRW_object_wire_theme_get(ob, view_layer, &color);
-      OVERLAY_empty_shape(cb, ob->obmat, ob->empty_drawsize, ob->empty_drawtype, color);
+      OVERLAY_empty_shape(cb, ob->object_to_world, ob->empty_drawsize, ob->empty_drawtype, color);
       break;
     case OB_EMPTY_IMAGE:
       OVERLAY_image_empty_cache_populate(vedata, ob);
@@ -372,7 +372,7 @@ static void OVERLAY_bounds(OVERLAY_ExtraCallBuffers *cb,
     case OB_BOUND_BOX:
       size_to_mat4(tmp, size);
       copy_v3_v3(tmp[3], center);
-      mul_m4_m4m4(tmp, ob->obmat, tmp);
+      mul_m4_m4m4(tmp, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_cube, color, tmp);
       break;
     case OB_BOUND_SPHERE:
@@ -380,7 +380,7 @@ static void OVERLAY_bounds(OVERLAY_ExtraCallBuffers *cb,
       size[1] = size[2] = size[0];
       size_to_mat4(tmp, size);
       copy_v3_v3(tmp[3], center);
-      mul_m4_m4m4(tmp, ob->obmat, tmp);
+      mul_m4_m4m4(tmp, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_sphere, color, tmp);
       break;
     case OB_BOUND_CYLINDER:
@@ -388,7 +388,7 @@ static void OVERLAY_bounds(OVERLAY_ExtraCallBuffers *cb,
       size[1] = size[0];
       size_to_mat4(tmp, size);
       copy_v3_v3(tmp[3], center);
-      mul_m4_m4m4(tmp, ob->obmat, tmp);
+      mul_m4_m4m4(tmp, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_cylinder, color, tmp);
       break;
     case OB_BOUND_CONE:
@@ -399,7 +399,7 @@ static void OVERLAY_bounds(OVERLAY_ExtraCallBuffers *cb,
       /* Cone batch has base at 0 and is pointing towards +Y. */
       swap_v3_v3(tmp[1], tmp[2]);
       tmp[3][2] -= size[2];
-      mul_m4_m4m4(tmp, ob->obmat, tmp);
+      mul_m4_m4m4(tmp, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_cone, color, tmp);
       break;
     case OB_BOUND_CAPSULE:
@@ -408,14 +408,14 @@ static void OVERLAY_bounds(OVERLAY_ExtraCallBuffers *cb,
       scale_m4_fl(tmp, size[0]);
       copy_v2_v2(tmp[3], center);
       tmp[3][2] = center[2] + max_ff(0.0f, size[2] - size[0]);
-      mul_m4_m4m4(final_mat, ob->obmat, tmp);
+      mul_m4_m4m4(final_mat, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_capsule_cap, color, final_mat);
       negate_v3(tmp[2]);
       tmp[3][2] = center[2] - max_ff(0.0f, size[2] - size[0]);
-      mul_m4_m4m4(final_mat, ob->obmat, tmp);
+      mul_m4_m4m4(final_mat, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_capsule_cap, color, final_mat);
       tmp[2][2] = max_ff(0.0f, size[2] * 2.0f - size[0] * 2.0f);
-      mul_m4_m4m4(final_mat, ob->obmat, tmp);
+      mul_m4_m4m4(final_mat, ob->object_to_world, tmp);
       DRW_buffer_add_entry(cb->empty_capsule_body, color, final_mat);
       break;
   }
@@ -489,7 +489,7 @@ static void OVERLAY_texture_space(OVERLAY_ExtraCallBuffers *cb, Object *ob, cons
     unit_m4(mat);
   }
 
-  mul_m4_m4m4(mat, ob->obmat, mat);
+  mul_m4_m4m4(mat, ob->object_to_world, mat);
 
   DRW_buffer_add_entry(cb->empty_cube, color, mat);
 }
@@ -511,7 +511,7 @@ static void OVERLAY_forcefield(OVERLAY_ExtraCallBuffers *cb, Object *ob, ViewLay
     };
   } instdata;
 
-  copy_m4_m4(instdata.mat, ob->obmat);
+  copy_m4_m4(instdata.mat, ob->object_to_world);
   instdata.size_x = instdata.size_y = instdata.size_z = ob->empty_drawsize;
 
   switch (pd->forcefield) {
@@ -531,16 +531,16 @@ static void OVERLAY_forcefield(OVERLAY_ExtraCallBuffers *cb, Object *ob, ViewLay
         instdata.size_x = instdata.size_y = instdata.size_z = pd->f_strength;
         float pos[4];
         BKE_where_on_path(ob, 0.0f, pos, nullptr, nullptr, nullptr, nullptr);
-        copy_v3_v3(instdata.pos, ob->obmat[3]);
+        copy_v3_v3(instdata.pos, ob->object_to_world[3]);
         translate_m4(instdata.mat, pos[0], pos[1], pos[2]);
         DRW_buffer_add_entry(cb->field_curve, color, &instdata);
 
         BKE_where_on_path(ob, 1.0f, pos, nullptr, nullptr, nullptr, nullptr);
-        copy_v3_v3(instdata.pos, ob->obmat[3]);
+        copy_v3_v3(instdata.pos, ob->object_to_world[3]);
         translate_m4(instdata.mat, pos[0], pos[1], pos[2]);
         DRW_buffer_add_entry(cb->field_sphere_limit, color, &instdata);
         /* Restore */
-        copy_v3_v3(instdata.pos, ob->obmat[3]);
+        copy_v3_v3(instdata.pos, ob->object_to_world[3]);
       }
       break;
   }
@@ -625,7 +625,7 @@ void OVERLAY_light_cache_populate(OVERLAY_Data *vedata, Object *ob)
     };
   } instdata;
 
-  copy_m4_m4(instdata.mat, ob->obmat);
+  copy_m4_m4(instdata.mat, ob->object_to_world);
   /* FIXME / TODO: clip_end has no meaning nowadays.
    * In EEVEE, Only clip_sta is used shadow-mapping.
    * Clip end is computed automatically based on light power.
@@ -708,7 +708,7 @@ void OVERLAY_lightprobe_cache_populate(OVERLAY_Data *vedata, Object *ob)
     };
   } instdata;
 
-  copy_m4_m4(instdata.mat, ob->obmat);
+  copy_m4_m4(instdata.mat, ob->object_to_world);
 
   switch (prb->type) {
     case LIGHTPROBE_TYPE_CUBE:
@@ -720,15 +720,15 @@ void OVERLAY_lightprobe_cache_populate(OVERLAY_Data *vedata, Object *ob)
       if (show_influence) {
         char shape = (prb->attenuation_type == LIGHTPROBE_SHAPE_BOX) ? OB_CUBE : OB_EMPTY_SPHERE;
         float f = 1.0f - prb->falloff;
-        OVERLAY_empty_shape(cb, ob->obmat, prb->distinf, shape, color_p);
-        OVERLAY_empty_shape(cb, ob->obmat, prb->distinf * f, shape, color_p);
+        OVERLAY_empty_shape(cb, ob->object_to_world, prb->distinf, shape, color_p);
+        OVERLAY_empty_shape(cb, ob->object_to_world, prb->distinf * f, shape, color_p);
       }
 
       if (show_parallax) {
         char shape = (prb->parallax_type == LIGHTPROBE_SHAPE_BOX) ? OB_CUBE : OB_EMPTY_SPHERE;
         float dist = ((prb->flag & LIGHTPROBE_FLAG_CUSTOM_PARALLAX) != 0) ? prb->distpar :
                                                                             prb->distinf;
-        OVERLAY_empty_shape(cb, ob->obmat, dist, shape, color_p);
+        OVERLAY_empty_shape(cb, ob->object_to_world, dist, shape, color_p);
       }
       break;
     case LIGHTPROBE_TYPE_GRID:
@@ -738,8 +738,8 @@ void OVERLAY_lightprobe_cache_populate(OVERLAY_Data *vedata, Object *ob)
 
       if (show_influence) {
         float f = 1.0f - prb->falloff;
-        OVERLAY_empty_shape(cb, ob->obmat, 1.0 + prb->distinf, OB_CUBE, color_p);
-        OVERLAY_empty_shape(cb, ob->obmat, 1.0 + prb->distinf * f, OB_CUBE, color_p);
+        OVERLAY_empty_shape(cb, ob->object_to_world, 1.0 + prb->distinf, OB_CUBE, color_p);
+        OVERLAY_empty_shape(cb, ob->object_to_world, 1.0 + prb->distinf * f, OB_CUBE, color_p);
       }
 
       /* Data dots */
@@ -777,7 +777,7 @@ void OVERLAY_lightprobe_cache_populate(OVERLAY_Data *vedata, Object *ob)
       zero_v3(instdata.mat[2]);
       DRW_buffer_add_entry(cb->empty_cube, color_p, &instdata);
 
-      normalize_m4_m4(instdata.mat, ob->obmat);
+      normalize_m4_m4(instdata.mat, ob->object_to_world);
       OVERLAY_empty_shape(cb, instdata.mat, ob->empty_drawsize, OB_SINGLE_ARROW, color_p);
       break;
   }
@@ -797,7 +797,7 @@ void OVERLAY_speaker_cache_populate(OVERLAY_Data *vedata, Object *ob)
   float *color_p;
   DRW_object_wire_theme_get(ob, view_layer, &color_p);
 
-  DRW_buffer_add_entry(cb->speaker, color_p, ob->obmat);
+  DRW_buffer_add_entry(cb->speaker, color_p, ob->object_to_world);
 }
 
 /** \} */
@@ -890,7 +890,7 @@ static void camera_view3d_reconstruction(
       float object_imat[4][4];
       invert_m4_m4(object_imat, object_mat);
 
-      mul_m4_m4m4(tracking_object_mat, ob->obmat, object_imat);
+      mul_m4_m4m4(tracking_object_mat, ob->object_to_world, object_imat);
     }
 
     ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
@@ -1132,14 +1132,17 @@ void OVERLAY_camera_cache_populate(OVERLAY_Data *vedata, Object *ob)
   DRW_object_wire_theme_get(ob, view_layer, &color_p);
   copy_v4_v4(instdata.color, color_p);
 
-  normalize_m4_m4(instdata.mat, ob->obmat);
+  normalize_m4_m4(instdata.mat, ob->object_to_world);
 
   /* BKE_camera_multiview_model_matrix already accounts for scale, don't do it here. */
   if (is_selection_camera_stereo) {
     copy_v3_fl(scale, 1.0f);
   }
   else {
-    copy_v3_fl3(scale, len_v3(ob->obmat[0]), len_v3(ob->obmat[1]), len_v3(ob->obmat[2]));
+    copy_v3_fl3(scale,
+                len_v3(ob->object_to_world[0]),
+                len_v3(ob->object_to_world[1]),
+                len_v3(ob->object_to_world[2]));
     /* Avoid division by 0. */
     if (ELEM(0.0f, scale[0], scale[1], scale[2])) {
       return;
@@ -1255,7 +1258,7 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb,
 
   if (ob->parent && (DRW_object_visibility_in_active_context(ob->parent) & OB_VISIBLE_SELF)) {
     float *parent_pos = ob->runtime.parent_display_origin;
-    OVERLAY_extra_line_dashed(cb, parent_pos, ob->obmat[3], relation_color);
+    OVERLAY_extra_line_dashed(cb, parent_pos, ob->object_to_world[3], relation_color);
   }
 
   /* Drawing the hook lines. */
@@ -1263,9 +1266,9 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb,
     if (md->type == eModifierType_Hook) {
       HookModifierData *hmd = (HookModifierData *)md;
       float center[3];
-      mul_v3_m4v3(center, ob->obmat, hmd->cent);
+      mul_v3_m4v3(center, ob->object_to_world, hmd->cent);
       if (hmd->object) {
-        OVERLAY_extra_line_dashed(cb, hmd->object->obmat[3], center, relation_color);
+        OVERLAY_extra_line_dashed(cb, hmd->object->object_to_world[3], center, relation_color);
       }
       OVERLAY_extra_point(cb, center, relation_color);
     }
@@ -1275,10 +1278,12 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb,
     Object *rbc_ob1 = ob->rigidbody_constraint->ob1;
     Object *rbc_ob2 = ob->rigidbody_constraint->ob2;
     if (rbc_ob1 && (DRW_object_visibility_in_active_context(rbc_ob1) & OB_VISIBLE_SELF)) {
-      OVERLAY_extra_line_dashed(cb, rbc_ob1->obmat[3], ob->obmat[3], relation_color);
+      OVERLAY_extra_line_dashed(
+          cb, rbc_ob1->object_to_world[3], ob->object_to_world[3], relation_color);
     }
     if (rbc_ob2 && (DRW_object_visibility_in_active_context(rbc_ob2) & OB_VISIBLE_SELF)) {
-      OVERLAY_extra_line_dashed(cb, rbc_ob2->obmat[3], ob->obmat[3], relation_color);
+      OVERLAY_extra_line_dashed(
+          cb, rbc_ob2->object_to_world[3], ob->object_to_world[3], relation_color);
     }
   }
 
@@ -1307,7 +1312,8 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb,
         }
 
         if (camob) {
-          OVERLAY_extra_line_dashed(cb, camob->obmat[3], ob->obmat[3], constraint_color);
+          OVERLAY_extra_line_dashed(
+              cb, camob->object_to_world[3], ob->object_to_world[3], constraint_color);
         }
       }
       else {
@@ -1330,7 +1336,7 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb,
             else {
               unit_m4(ct->matrix);
             }
-            OVERLAY_extra_line_dashed(cb, ct->matrix[3], ob->obmat[3], constraint_color);
+            OVERLAY_extra_line_dashed(cb, ct->matrix[3], ob->object_to_world[3], constraint_color);
           }
 
           BKE_constraint_targets_flush(curcon, &targets, true);
@@ -1387,7 +1393,7 @@ static void OVERLAY_volume_extra(OVERLAY_ExtraCallBuffers *cb,
     copy_v3_v3(voxel_cubemat[3], min);
     /* move small cube into the domain (otherwise its centered on vertex of domain object) */
     translate_m4(voxel_cubemat, 1.0f, 1.0f, 1.0f);
-    mul_m4_m4m4(voxel_cubemat, ob->obmat, voxel_cubemat);
+    mul_m4_m4m4(voxel_cubemat, ob->object_to_world, voxel_cubemat);
 
     DRW_buffer_add_entry(cb->empty_cube, color, voxel_cubemat);
   }
@@ -1493,15 +1499,15 @@ static void OVERLAY_object_center(OVERLAY_ExtraCallBuffers *cb,
   const bool is_library = ID_REAL_USERS(&ob->id) > 1 || ID_IS_LINKED(ob);
   BKE_view_layer_synced_ensure(scene, view_layer);
   if (ob == BKE_view_layer_active_object_get(view_layer)) {
-    DRW_buffer_add_entry(cb->center_active, ob->obmat[3]);
+    DRW_buffer_add_entry(cb->center_active, ob->object_to_world[3]);
   }
   else if (ob->base_flag & BASE_SELECTED) {
     DRWCallBuffer *cbuf = (is_library) ? cb->center_selected_lib : cb->center_selected;
-    DRW_buffer_add_entry(cbuf, ob->obmat[3]);
+    DRW_buffer_add_entry(cbuf, ob->object_to_world[3]);
   }
   else if (pd->v3d_flag & V3D_DRAW_CENTERS) {
     DRWCallBuffer *cbuf = (is_library) ? cb->center_deselected_lib : cb->center_deselected;
-    DRW_buffer_add_entry(cbuf, ob->obmat[3]);
+    DRW_buffer_add_entry(cbuf, ob->object_to_world[3]);
   }
 }
 
@@ -1513,7 +1519,7 @@ static void OVERLAY_object_name(Object *ob, int theme_id)
   UI_GetThemeColor4ubv(theme_id, color);
 
   DRW_text_cache_add(dt,
-                     ob->obmat[3],
+                     ob->object_to_world[3],
                      ob->id.name + 2,
                      strlen(ob->id.name + 2),
                      10,
@@ -1571,7 +1577,7 @@ void OVERLAY_extra_cache_populate(OVERLAY_Data *vedata, Object *ob)
   /* Helpers for when we're transforming origins. */
   if (draw_xform) {
     const float color_xform[4] = {0.15f, 0.15f, 0.15f, 0.7f};
-    DRW_buffer_add_entry(cb->origin_xform, color_xform, ob->obmat);
+    DRW_buffer_add_entry(cb->origin_xform, color_xform, ob->object_to_world);
   }
   /* don't show object extras in set's */
   if (!from_dupli) {
@@ -1591,7 +1597,7 @@ void OVERLAY_extra_cache_populate(OVERLAY_Data *vedata, Object *ob)
       OVERLAY_collision(cb, ob, color);
     }
     if (ob->dtx & OB_AXIS) {
-      DRW_buffer_add_entry(cb->empty_axes, color, ob->obmat);
+      DRW_buffer_add_entry(cb->empty_axes, color, ob->object_to_world);
     }
     if (draw_volume) {
       OVERLAY_volume_extra(cb, vedata, ob, md, scene, color);
diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.cc b/source/blender/draw/engines/overlay/overlay_gpencil.cc
index 30765b30ce6..f5988d91e72 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.cc
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.cc
@@ -243,7 +243,7 @@ void OVERLAY_gpencil_cache_init(OVERLAY_Data *vedata)
     copy_v3_v3(col_grid, gpd->grid.color);
     col_grid[3] = max_ff(v3d->overlay.gpencil_grid_opacity, 0.01f);
 
-    copy_m4_m4(mat, ob->obmat);
+    copy_m4_m4(mat, ob->object_to_world);
 
     /* Rotate and scale except align to cursor. */
     bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd);
@@ -286,7 +286,7 @@ void OVERLAY_gpencil_cache_init(OVERLAY_Data *vedata)
       copy_v3_v3(mat[3], cursor->location);
     }
     else if (ts->gpencil_v3d_align & GP_PROJECT_VIEWSPACE) {
-      copy_v3_v3(mat[3], ob->obmat[3]);
+      copy_v3_v3(mat[3], ob->object_to_world[3]);
     }
 
     translate_m4(mat, gpd->grid.offset[0], gpd->grid.offset[1], 0.0f);
@@ -397,7 +397,7 @@ static void overlay_gpencil_draw_stroke_color_name(bGPDlayer * /*gpl*/,
         UI_GetThemeColor4ubv(theme_id, color);
 
         float fpt[3];
-        mul_v3_m4v3(fpt, ob->obmat, &pt->x);
+        mul_v3_m4v3(fpt, ob->object_to_world, &pt->x);
 
         struct DRWTextStore *dt = DRW_text_cache_ensure();
         DRW_text_cache_add(dt,
diff --git a/source/blender/draw/engines/overlay/overlay_image.cc b/source/blender/draw/engines/overlay/overlay_image.cc
index f42867622e4..7b99bd6bd18 100644
--- a/source/blender/draw/engines/overlay/overlay_image.cc
+++ b/source/blender/draw/engines/overlay/overlay_image.cc
@@ -392,7 +392,7 @@ void OVERLAY_image_empty_cache_populate(OVERLAY_Data *vedata, Object *ob)
     float image_aspect[2];
     overlay_image_calc_aspect(ima, size, image_aspect);
 
-    copy_m4_m4(mat, ob->obmat);
+    copy_m4_m4(mat, ob->object_to_world);
     mul_v3_fl(mat[0], image_aspect[0] * 0.5f * ob->empty_drawsize);
     mul_v3_fl(mat[1], image_aspect[1] * 0.5f * ob->empty_drawsize);
     madd_v3_v3fl(mat[3], mat[0], ob->ima_ofs[0] * 2.0f + 1.0f);
diff --git a/source/blender/draw/engines/overlay/overlay_lattice.cc b/source/blender/draw/engines/overlay/overlay_lattice.cc
index 7b59aa78c89..72c3335d871 100644
--- a/source/blender/draw/engines/overlay/overlay_lattice.cc
+++ b/source/blender/draw/engines/overlay/overlay_lattice.cc
@@ -52,7 +52,7 @@ void OVERLAY_lattice_cache_populate(OVERLAY_Data *vedata, Object *ob)
   DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color);
 
   struct GPUBatch *geom = DRW_cache_lattice_wire_get(ob, false);
-  OVERLAY_extra_wire(cb, geom, ob->obmat, color);
+  OVERLAY_extra_wire(cb, geom, ob->object_to_world, color);
 }
 
 void OVERLAY_edit_lattice_draw(OVERLAY_Data *vedata)
diff --git a/source/blender/draw/engines/overlay/overlay_metaball.cc b/source/blender/draw/engines/overlay/overlay_metaball.cc
index 2fc6910fe44..dd0a862337e 100644
--- a/source/blender/draw/engines/overlay/overlay_metaball.cc
+++ b/source/blender/draw/engines/overlay/overlay_metaball.cc
@@ -45,10 +45,10 @@ static void metaball_instance_data_set(
     BoneInstanceData *data, Object *ob, const float *pos, const float radius, const float color[4])
 {
   /* Bone point radius is 0.05. Compensate for that. */
-  mul_v3_v3fl(data->mat[0], ob->obmat[0], radius / 0.05f);
-  mul_v3_v3fl(data->mat[1], ob->obmat[1], radius / 0.05f);
-  mul_v3_v3fl(data->mat[2], ob->obmat[2], radius / 0.05f);
-  mul_v3_m4v3(data->mat[3], ob->obmat, pos);
+  mul_v3_v3fl(data->mat[0], ob->object_to_world[0], radius / 0.05f);
+  mul_v3_v3fl(data->mat[1], ob->object_to_world[1], radius / 0.05f);
+  mul_v3_v3fl(data->mat[2], ob->object_to_world[2], radius / 0.05f);
+  mul_v3_m4v3(data->mat[3], ob->object_to_world, pos);
   /* WATCH: Reminder, alpha is wire-size. */
   OVERLAY_bone_instance_data_set_color(data, color);
 }
diff --git a/source/blender/draw/engines/overlay/overlay_outline.cc b/source/blender/draw/engines/overlay/overlay_outline.cc
index 3213fe144e9..c2df665eba3 100644
--- a/source/blender/draw/engines/overlay/overlay_outline.cc
+++ b/source/blender/draw/engines/overlay/overlay_outline.cc
@@ -43,7 +43,7 @@ static void gpencil_depth_plane(Object *ob, float r_plane[4])
   add_v3_fl(size, 1e-8f);
   rescale_m4(mat, size);
   /* BBox space to World. */
-  mul_m4_m4m4(mat, ob->obmat, mat);
+  mul_m4_m4m4(mat, ob->object_to_world, mat);
   /* BBox center in world space. */
   copy_v3_v3(center, mat[3]);
   /* View Vector. */
@@ -188,7 +188,7 @@ static void gpencil_layer_cache_populate(bGPDlayer *gpl,
   const bool is_screenspace = (gpd->flag & GP_DATA_STROKE_KEEPTHICKNESS) != 0;
   const bool is_stroke_order_3d = (gpd->draw_mode == GP_DRAWMODE_3D);
 
-  float object_scale = mat4_to_scale(iter->ob->obmat);
+  float object_scale = mat4_to_scale(iter->ob->object_to_world);
   /* Negate thickness sign to tag that strokes are in screen space.
    * Convert to world units (by default, 1 meter = 2000 pixels). */
   float thickness_scale = (is_screenspace) ? -1.0f : (gpd->pixfactor / 2000.0f);
diff --git a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
index c0d74ea73f3..fd1657b3d59 100644
--- a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
+++ b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
@@ -90,7 +90,7 @@ static void populate_cache_for_instance(Object &object,
       DRWShadingGroup *sub_grp = DRW_shgroup_create_sub(pd.viewer_attribute_instance_grp);
       DRW_shgroup_uniform_vec4_copy(sub_grp, "ucolor", color);
       GPUBatch *batch = DRW_cache_curve_edge_wire_get(&object);
-      DRW_shgroup_call_obmat(sub_grp, batch, object.obmat);
+      DRW_shgroup_call_obmat(sub_grp, batch, object.object_to_world);
       break;
     }
     case OB_CURVES: {
@@ -135,7 +135,7 @@ static void populate_cache_for_geometry(Object &object,
       if (curves.attributes().contains(".viewer")) {
         GPUBatch *batch = DRW_cache_curve_edge_wire_viewer_attribute_get(&object);
         DRW_shgroup_uniform_float_copy(pd.viewer_attribute_curve_grp, "opacity", opacity);
-        DRW_shgroup_call_obmat(pd.viewer_attribute_curve_grp, batch, object.obmat);
+        DRW_shgroup_call_obmat(pd.viewer_attribute_curve_grp, batch, object.object_to_world);
       }
       break;
     }
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc
index 7ee0e89f2f9..7053d0039cf 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.cc
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc
@@ -132,12 +132,12 @@ static void wireframe_hair_cache_populate(OVERLAY_Data *vedata, Object *ob, Part
       if (collection != nullptr) {
         sub_v3_v3(dupli_mat[3], collection->instance_offset);
       }
-      mul_m4_m4m4(dupli_mat, dupli_parent->obmat, dupli_mat);
+      mul_m4_m4m4(dupli_mat, dupli_parent->object_to_world, dupli_mat);
     }
     else {
-      copy_m4_m4(dupli_mat, dupli_object->ob->obmat);
+      copy_m4_m4(dupli_mat, dupli_object->ob->object_to_world);
       invert_m4(dupli_mat);
-      mul_m4_m4m4(dupli_mat, ob->obmat, dupli_mat);
+      mul_m4_m4m4(dupli_mat, ob->object_to_world, dupli_mat);
     }
   }
   else {
@@ -217,7 +217,7 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
     }
 
     if (geom) {
-      OVERLAY_extra_wire(cb, geom, ob->obmat, color);
+      OVERLAY_extra_wire(cb, geom, ob->object_to_world, color);
     }
   }
 
@@ -230,12 +230,12 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
         if (dupli->wire_shgrp == cb->extra_loose_points) {
           float *color;
           DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color);
-          OVERLAY_extra_loose_points(cb, dupli->wire_geom, ob->obmat, color);
+          OVERLAY_extra_loose_points(cb, dupli->wire_geom, ob->object_to_world, color);
         }
         else if (dupli->wire_shgrp == cb->extra_wire) {
           float *color;
           DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color);
-          OVERLAY_extra_wire(cb, dupli->wire_geom, ob->obmat, color);
+          OVERLAY_extra_wire(cb, dupli->wire_geom, ob->object_to_world, color);
         }
         else {
           DRW_shgroup_call(dupli->wire_shgrp, dupli->wire_geom, ob);
@@ -264,7 +264,7 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
 
       struct GPUBatch *geom = DRW_cache_object_face_wireframe_get(ob);
       if (geom) {
-        OVERLAY_extra_loose_points(cb, geom, ob->obmat, color);
+        OVERLAY_extra_loose_points(cb, geom, ob->object_to_world, color);
       }
       return;
     }
@@ -318,14 +318,14 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
     if (is_mesh_verts_only) {
       geom = DRW_cache_mesh_all_verts_get(ob);
       if (geom) {
-        OVERLAY_extra_loose_points(cb, geom, ob->obmat, color);
+        OVERLAY_extra_loose_points(cb, geom, ob->object_to_world, color);
         shgrp = cb->extra_loose_points;
       }
     }
     else {
       geom = DRW_cache_mesh_loose_edges_get(ob);
       if (geom) {
-        OVERLAY_extra_wire(cb, geom, ob->obmat, color);
+        OVERLAY_extra_wire(cb, geom, ob->object_to_world, color);
         shgrp = cb->extra_wire;
       }
     }
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 026a1f52ac1..07e2a42b808 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -205,7 +205,7 @@ static void select_cache_populate(void *vedata, Object *ob)
     struct Mesh *me = ob->data;
     if (e_data.context.select_mode & SCE_SELECT_FACE) {
       struct GPUBatch *geom_faces = DRW_mesh_batch_cache_get_triangles_with_select_id(me);
-      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_faces, ob->obmat);
+      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_faces, ob->object_to_world);
     }
     else if (ob->dt >= OB_SOLID) {
 #ifdef USE_CAGE_OCCLUSION
@@ -213,17 +213,17 @@ static void select_cache_populate(void *vedata, Object *ob)
 #else
       struct GPUBatch *geom_faces = DRW_mesh_batch_cache_get_surface(me);
 #endif
-      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_faces, ob->obmat);
+      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_faces, ob->object_to_world);
     }
 
     if (e_data.context.select_mode & SCE_SELECT_EDGE) {
       struct GPUBatch *geom_edges = DRW_mesh_batch_cache_get_edges_with_select_id(me);
-      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_edges, ob->obmat);
+      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_edges, ob->object_to_world);
     }
 
     if (e_data.context.select_mode & SCE_SELECT_VERTEX) {
       struct GPUBatch *geom_verts = DRW_mesh_batch_cache_get_verts_with_select_id(me);
-      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_verts, ob->obmat);
+      DRW_shgroup_call_obmat(stl->g_data->shgrp_depth_only, geom_verts, ob->object_to_world);
     }
     return;
   }
@@ -231,7 +231,7 @@ static void select_cache_populate(void *vedata, Object *ob)
   float min[3], max[3];
   select_id_object_min_max(ob, min, max);
 
-  if (DRW_culling_min_max_test(stl->g_data->view_subregion, ob->obmat, min, max)) {
+  if (DRW_culling_min_max_test(stl->g_data->view_subregion, ob->object_to_world, min, max)) {
     if (sel_data == NULL) {
       sel_data = (SELECTID_ObjectData *)DRW_drawdata_ensure(
           &ob->id, &draw_engine_select_type, sizeof(SELECTID_ObjectData), NULL, NULL);
diff --git a/source/blender/draw/engines/workbench/workbench_shadow.c b/source/blender/draw/engines/workbench/workbench_shadow.c
index 0b34e849049..eb4d546648a 100644
--- a/source/blender/draw/engines/workbench/workbench_shadow.c
+++ b/source/blender/draw/engines/workbench/workbench_shadow.c
@@ -172,7 +172,7 @@ static const BoundBox *workbench_shadow_object_shadow_bbox_get(WORKBENCH_Private
 {
   if (oed->shadow_bbox_dirty || wpd->shadow_changed) {
     float tmp_mat[4][4];
-    mul_m4_m4m4(tmp_mat, wpd->shadow_inv, ob->obmat);
+    mul_m4_m4m4(tmp_mat, wpd->shadow_inv, ob->object_to_world);
 
     /* Get AABB in shadow space. */
     INIT_MINMAX(oed->shadow_min, oed->shadow_max);
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c
index ce7773e7439..7c6df93f5a3 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -237,7 +237,7 @@ static void workbench_volume_object_cache_populate(WORKBENCH_Data *vedata,
 
   /* Combined texture to object, and object to world transform. */
   float texture_to_world[4][4];
-  mul_m4_m4m4(texture_to_world, ob->obmat, grid->texture_to_object);
+  mul_m4_m4m4(texture_to_world, ob->object_to_world, grid->texture_to_object);
 
   if (use_slice) {
     float invviewmat[4][4];
@@ -291,7 +291,7 @@ static void workbench_volume_object_cache_populate(WORKBENCH_Data *vedata,
 
   /* Compute density scale. */
   const float density_scale = volume->display.density *
-                              BKE_volume_density_scale(volume, ob->obmat);
+                              BKE_volume_density_scale(volume, ob->object_to_world);
 
   DRW_shgroup_uniform_texture(grp, "densityTexture", grid->texture);
   /* TODO: implement shadow texture, see manta_smoke_calc_transparency. */