1 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 27659042f50..63093692e43 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -535,7 +535,7 @@ static int add_hook_object(const bContext *C,
     ob = add_hook_object_new(bmain, scene, view_layer, v3d, obedit);
 
     /* transform cent to global coords for loc */
-    mul_v3_m4v3(ob->loc, obedit->obmat, cent);
+    mul_v3_m4v3(ob->loc, obedit->object_to_world, cent);
   }
 
   md = obedit->modifiers.first;
@@ -556,13 +556,13 @@ static int add_hook_object(const bContext *C,
 
   unit_m4(pose_mat);
 
-  invert_m4_m4(obedit->imat, obedit->obmat);
+  invert_m4_m4(obedit->imat, obedit->object_to_world);
   if (mode == OBJECT_ADDHOOK_NEWOB) {
     /* pass */
   }
   else {
     /* may overwrite with pose-bone location, below */
-    mul_v3_m4v3(cent, obedit->imat, ob->obmat[3]);
+    mul_v3_m4v3(cent, obedit->imat, ob->object_to_world[3]);
   }
 
   if (mode == OBJECT_ADDHOOK_SELOB_BONE) {
@@ -576,7 +576,7 @@ static int add_hook_object(const bContext *C,
       pchan_act = BKE_pose_channel_active_if_layer_visible(ob);
       if (LIKELY(pchan_act)) {
         invert_m4_m4(pose_mat, pchan_act->pose_mat);
-        mul_v3_m4v3(cent, ob->obmat, pchan_act->pose_mat[3]);
+        mul_v3_m4v3(cent, ob->object_to_world, pchan_act->pose_mat[3]);
         mul_v3_m4v3(cent, obedit->imat, cent);
       }
     }
@@ -588,16 +588,16 @@ static int add_hook_object(const bContext *C,
   copy_v3_v3(hmd->cent, cent);
 
   /* matrix calculus */
-  /* vert x (obmat x hook->imat) x hook->obmat x ob->imat */
+  /* vert x (obmat x hook->imat) x hook->object_to_world x ob->imat */
   /*        (parentinv         )                          */
   Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
   Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
   BKE_object_transform_copy(object_eval, ob);
   BKE_object_where_is_calc(depsgraph, scene_eval, object_eval);
 
-  invert_m4_m4(object_eval->imat, object_eval->obmat);
+  invert_m4_m4(object_eval->imat, object_eval->object_to_world);
   /* apparently this call goes from right to left... */
-  mul_m4_series(hmd->parentinv, pose_mat, object_eval->imat, obedit->obmat);
+  mul_m4_series(hmd->parentinv, pose_mat, object_eval->imat, obedit->object_to_world);
 
   DEG_relations_tag_update(bmain);
 
@@ -834,10 +834,10 @@ static int object_hook_recenter_exec(bContext *C, wmOperator *op)
   }
 
   /* recenter functionality */
-  copy_m3_m4(bmat, ob->obmat);
+  copy_m3_m4(bmat, ob->object_to_world);
   invert_m3_m3(imat, bmat);
 
-  sub_v3_v3v3(hmd->cent, scene->cursor.location, ob->obmat[3]);
+  sub_v3_v3v3(hmd->cent, scene->cursor.location, ob->object_to_world[3]);
   mul_m3_v3(imat, hmd->cent);
 
   DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);