Refactor: Rename Object->imat to Object->world_to_object

The goal is to improve clarity and readability, without
introducing big design changes.

Follows the recent obmat to object_to_world refactor: the
similar naming is used, and it is a run-time only rename,
meaning, there is no affect on .blend files.

This patch does not touch the redundant inversions. Those
can be removed in almost (if not all) cases, but it would
be the best to do it as a separate change.

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

7 files changed, 30 insertions, 30 deletions

diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.c b/source/blender/editors/mesh/editmesh_add_gizmo.c
index ad900c997f8..03c6104bb0d 100644
--- a/source/blender/editors/mesh/editmesh_add_gizmo.c
+++ b/source/blender/editors/mesh/editmesh_add_gizmo.c
@@ -316,8 +316,8 @@ static int add_primitive_cube_gizmo_exec(bContext *C, wmOperator *op)
     PropertyRNA *prop_matrix = RNA_struct_find_property(op->ptr, "matrix");
     if (RNA_property_is_set(op->ptr, prop_matrix)) {
       RNA_property_float_get_array(op->ptr, prop_matrix, &matrix[0][0]);
-      invert_m4_m4(obedit->imat, obedit->object_to_world);
-      mul_m4_m4m4(matrix, obedit->imat, matrix);
+      invert_m4_m4(obedit->world_to_object, obedit->object_to_world);
+      mul_m4_m4m4(matrix, obedit->world_to_object, matrix);
     }
     else {
       /* For the first update the widget may not set the matrix. */
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 9df3a521cfa..88bcefc5cc8 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -761,11 +761,11 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
       continue;
     }
 
-    invert_m4_m4(vc.obedit->imat, vc.obedit->object_to_world);
+    invert_m4_m4(vc.obedit->world_to_object, vc.obedit->object_to_world);
     ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
 
     float local_center[3];
-    mul_v3_m4v3(local_center, vc.obedit->imat, center);
+    mul_v3_m4v3(local_center, vc.obedit->world_to_object, center);
 
     /* call extrude? */
     if (verts_len != 0) {
@@ -810,11 +810,11 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
         float view_vec[3], cross[3];
 
         /* convert the 2D normal into 3D */
-        mul_mat3_m4_v3(vc.rv3d->viewinv, nor); /* World-space. */
-        mul_mat3_m4_v3(vc.obedit->imat, nor);  /* Local-space. */
+        mul_mat3_m4_v3(vc.rv3d->viewinv, nor);           /* World-space. */
+        mul_mat3_m4_v3(vc.obedit->world_to_object, nor); /* Local-space. */
 
         /* correct the normal to be aligned on the view plane */
-        mul_v3_mat3_m4v3(view_vec, vc.obedit->imat, vc.rv3d->viewinv[2]);
+        mul_v3_mat3_m4v3(view_vec, vc.obedit->world_to_object, vc.rv3d->viewinv[2]);
         cross_v3_v3v3(cross, nor, view_vec);
         cross_v3_v3v3(nor, view_vec, cross);
         normalize_v3(nor);
@@ -825,7 +825,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
 
       mul_m4_v3(vc.obedit->object_to_world, ofs); /* view space */
       ED_view3d_win_to_3d_int(vc.v3d, vc.region, ofs, event->mval, ofs);
-      mul_m4_v3(vc.obedit->imat, ofs); /* back in object space */
+      mul_m4_v3(vc.obedit->world_to_object, ofs); /* back in object space */
 
       sub_v3_v3(ofs, local_center);
 
@@ -876,7 +876,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
       copy_v3_v3(local_center, cursor);
       ED_view3d_win_to_3d_int(vc.v3d, vc.region, local_center, event->mval, local_center);
 
-      mul_m4_v3(vc.obedit->imat, local_center); /* back in object space */
+      mul_m4_v3(vc.obedit->world_to_object, local_center); /* back in object space */
 
       EDBM_op_init(vc.em, &bmop, op, "create_vert co=%v", local_center);
       BMO_op_exec(vc.em->bm, &bmop);
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index 63e37b18827..cfd07a6ff35 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -124,7 +124,7 @@ static int edbm_polybuild_transform_at_cursor_invoke(bContext *C,
   BMEditMesh *em = vc.em;
   BMesh *bm = em->bm;
 
-  invert_m4_m4(vc.obedit->imat, vc.obedit->object_to_world);
+  invert_m4_m4(vc.obedit->world_to_object, vc.obedit->object_to_world);
   ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
 
   if (!ele_act) {
@@ -192,7 +192,7 @@ static int edbm_polybuild_delete_at_cursor_invoke(bContext *C,
   BMEditMesh *em = vc.em;
   BMesh *bm = em->bm;
 
-  invert_m4_m4(vc.obedit->imat, vc.obedit->object_to_world);
+  invert_m4_m4(vc.obedit->world_to_object, vc.obedit->object_to_world);
   ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
 
   if (!ele_act) {
@@ -286,7 +286,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
   BMEditMesh *em = vc.em;
   BMesh *bm = em->bm;
 
-  invert_m4_m4(vc.obedit->imat, vc.obedit->object_to_world);
+  invert_m4_m4(vc.obedit->world_to_object, vc.obedit->object_to_world);
   ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
 
   edbm_selectmode_ensure(vc.scene, vc.em, SCE_SELECT_VERTEX);
@@ -296,7 +296,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
     copy_v3_v3(center, vc.scene->cursor.location);
     mul_v3_m4v3(center, vc.obedit->object_to_world, center);
     ED_view3d_win_to_3d_int(vc.v3d, vc.region, center, event->mval, center);
-    mul_m4_v3(vc.obedit->imat, center);
+    mul_m4_v3(vc.obedit->world_to_object, center);
 
     BMVert *v_new = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
     edbm_flag_disable_all_multi(vc.scene, vc.view_layer, vc.v3d, BM_ELEM_SELECT);
@@ -311,7 +311,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
     mid_v3_v3v3(center, e_act->v1->co, e_act->v2->co);
     mul_m4_v3(vc.obedit->object_to_world, center);
     ED_view3d_win_to_3d_int(vc.v3d, vc.region, center, event->mval, center);
-    mul_m4_v3(vc.obedit->imat, center);
+    mul_m4_v3(vc.obedit->world_to_object, center);
     if (f_reference->len == 3 && RNA_boolean_get(op->ptr, "create_quads")) {
       const float fac = line_point_factor_v3(center, e_act->v1->co, e_act->v2->co);
       BMVert *v_new = BM_edge_split(bm, e_act, e_act->v1, NULL, CLAMPIS(fac, 0.0f, 1.0f));
@@ -366,7 +366,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
 
       mul_v3_m4v3(center, vc.obedit->object_to_world, v_act->co);
       ED_view3d_win_to_3d_int(vc.v3d, vc.region, center, event->mval, center);
-      mul_m4_v3(vc.obedit->imat, center);
+      mul_m4_v3(vc.obedit->world_to_object, center);
 
       BMVert *v_quad[4];
       v_quad[0] = v_act;
@@ -388,7 +388,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
       /* Just add edge */
       mul_m4_v3(vc.obedit->object_to_world, center);
       ED_view3d_win_to_3d_int(vc.v3d, vc.region, v_act->co, event->mval, center);
-      mul_m4_v3(vc.obedit->imat, center);
+      mul_m4_v3(vc.obedit->world_to_object, center);
 
       BMVert *v_new = BM_vert_create(bm, center, NULL, BM_CREATE_NOP);
 
@@ -464,7 +464,7 @@ static int edbm_polybuild_split_at_cursor_invoke(bContext *C,
   BMEditMesh *em = vc.em;
   BMesh *bm = em->bm;
 
-  invert_m4_m4(vc.obedit->imat, vc.obedit->object_to_world);
+  invert_m4_m4(vc.obedit->world_to_object, vc.obedit->object_to_world);
   ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
 
   edbm_selectmode_ensure(vc.scene, vc.em, SCE_SELECT_VERTEX);
@@ -477,7 +477,7 @@ static int edbm_polybuild_split_at_cursor_invoke(bContext *C,
     mid_v3_v3v3(center, e_act->v1->co, e_act->v2->co);
     mul_m4_v3(vc.obedit->object_to_world, center);
     ED_view3d_win_to_3d_int(vc.v3d, vc.region, center, event->mval, center);
-    mul_m4_v3(vc.obedit->imat, center);
+    mul_m4_v3(vc.obedit->world_to_object, center);
 
     const float fac = line_point_factor_v3(center, e_act->v1->co, e_act->v2->co);
     BMVert *v_new = BM_edge_split(bm, e_act, e_act->v1, NULL, CLAMPIS(fac, 0.0f, 1.0f));
diff --git a/source/blender/editors/mesh/editmesh_preselect_elem.c b/source/blender/editors/mesh/editmesh_preselect_elem.c
index 732f39e4123..5d8ce7cae44 100644
--- a/source/blender/editors/mesh/editmesh_preselect_elem.c
+++ b/source/blender/editors/mesh/editmesh_preselect_elem.c
@@ -245,7 +245,7 @@ static void view3d_preselect_update_preview_triangle_from_vert(struct EditMesh_P
   if (e_pair[1] != NULL) {
     mul_v3_m4v3(center, vc->obedit->object_to_world, v_act->co);
     ED_view3d_win_to_3d_int(vc->v3d, vc->region, center, mval, center);
-    mul_m4_v3(vc->obedit->imat, center);
+    mul_m4_v3(vc->obedit->world_to_object, center);
 
     psel->preview_tris = MEM_mallocN(sizeof(*psel->preview_tris) * 2, __func__);
     psel->preview_lines = MEM_mallocN(sizeof(*psel->preview_lines) * 4, __func__);
@@ -313,7 +313,7 @@ static void view3d_preselect_update_preview_triangle_from_edge(struct EditMesh_P
   mid_v3_v3v3(center, eed->v1->co, eed->v2->co);
   mul_m4_v3(vc->obedit->object_to_world, center);
   ED_view3d_win_to_3d_int(vc->v3d, vc->region, center, mval, center);
-  mul_m4_v3(vc->obedit->imat, center);
+  mul_m4_v3(vc->obedit->world_to_object, center);
 
   copy_v3_v3(psel->preview_tris[0][0], eed->v1->co);
   copy_v3_v3(psel->preview_tris[0][1], eed->v2->co);
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index 9469639718f..d9721db326a 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -135,7 +135,7 @@ static void face_to_plane(const Object *ob, BMFace *face, float r_plane[4])
 {
   float normal[3], co[3];
   copy_v3_v3(normal, face->no);
-  mul_transposed_mat3_m4_v3(ob->imat, normal);
+  mul_transposed_mat3_m4_v3(ob->world_to_object, normal);
   normalize_v3(normal);
   mul_v3_m4v3(co, ob->object_to_world, BM_FACE_FIRST_LOOP(face)->v->co);
   plane_from_point_normal_v3(r_plane, co, normal);
@@ -206,7 +206,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
     BMEditMesh *em = BKE_editmesh_from_object(ob);
     BMesh *bm = em->bm;
     Material ***material_array = NULL;
-    invert_m4_m4(ob->imat, ob->object_to_world);
+    invert_m4_m4(ob->world_to_object, ob->object_to_world);
     int custom_data_offset = 0;
 
     if (bm->totfacesel == 0) {
@@ -269,7 +269,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
           case SIMFACE_NORMAL: {
             float normal[3];
             copy_v3_v3(normal, face->no);
-            mul_transposed_mat3_m4_v3(ob->imat, normal);
+            mul_transposed_mat3_m4_v3(ob->world_to_object, normal);
             normalize_v3(normal);
             BLI_kdtree_3d_insert(tree_3d, tree_index++, normal);
             break;
@@ -414,7 +414,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
           case SIMFACE_NORMAL: {
             float normal[3];
             copy_v3_v3(normal, face->no);
-            mul_transposed_mat3_m4_v3(ob->imat, normal);
+            mul_transposed_mat3_m4_v3(ob->world_to_object, normal);
             normalize_v3(normal);
 
             /* We are treating the normals as coordinates, the "nearest" one will
@@ -1028,7 +1028,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
     BLI_bitmap *defbase_selected = NULL;
     int defbase_len = 0;
 
-    invert_m4_m4(ob->imat, ob->object_to_world);
+    invert_m4_m4(ob->world_to_object, ob->object_to_world);
 
     if (bm->totvertsel == 0) {
       continue;
@@ -1067,7 +1067,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
           case SIMVERT_NORMAL: {
             float normal[3];
             copy_v3_v3(normal, vert->no);
-            mul_transposed_mat3_m4_v3(ob->imat, normal);
+            mul_transposed_mat3_m4_v3(ob->world_to_object, normal);
             normalize_v3(normal);
 
             BLI_kdtree_3d_insert(tree_3d, normal_tree_index++, normal);
@@ -1217,7 +1217,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
           case SIMVERT_NORMAL: {
             float normal[3];
             copy_v3_v3(normal, vert->no);
-            mul_transposed_mat3_m4_v3(ob->imat, normal);
+            mul_transposed_mat3_m4_v3(ob->world_to_object, normal);
             normalize_v3(normal);
 
             /* We are treating the normals as coordinates, the "nearest" one will
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 9f5c0d74ced..8b29472f687 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3356,8 +3356,8 @@ static bool merge_target(BMEditMesh *em,
   if (use_cursor) {
     vco = scene->cursor.location;
     copy_v3_v3(co, vco);
-    invert_m4_m4(ob->imat, ob->object_to_world);
-    mul_m4_v3(ob->imat, co);
+    invert_m4_m4(ob->world_to_object, ob->object_to_world);
+    mul_m4_v3(ob->world_to_object, co);
   }
   else {
     float fac;
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 10acfc96ca8..f6ffbec094e 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -1942,7 +1942,7 @@ void EDBM_project_snap_verts(
                 NULL,
                 co_proj,
                 NULL)) {
-          mul_v3_m4v3(eve->co, obedit->imat, co_proj);
+          mul_v3_m4v3(eve->co, obedit->world_to_object, co_proj);
         }
       }
     }