1 files changed, 16 insertions, 11 deletions

diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 63dcf6c0989..a5b2442f11c 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -945,7 +945,11 @@ static void init_TransDataContainers(TransInfo *t,
       /* Pose transform operates on `ob->pose` so don't skip duplicate object-data. */
       params.no_dup_data = (object_mode & OB_MODE_POSE) == 0;
       objects = BKE_view_layer_array_from_objects_in_mode_params(
-          t->view_layer, (t->spacetype == SPACE_VIEW3D) ? t->view : NULL, &objects_len, &params);
+          t->scene,
+          t->view_layer,
+          (t->spacetype == SPACE_VIEW3D) ? t->view : NULL,
+          &objects_len,
+          &params);
       free_objects = true;
     }
 
@@ -977,7 +981,7 @@ static void init_TransDataContainers(TransInfo *t,
 
       if (tc->use_local_mat) {
         BLI_assert((t->flag & T_2D_EDIT) == 0);
-        copy_m4_m4(tc->mat, objects[i]->obmat);
+        copy_m4_m4(tc->mat, objects[i]->object_to_world);
         copy_m3_m4(tc->mat3, tc->mat);
         /* for non-invertible scale matrices, invert_m4_m4_fallback()
          * can still provide a valid pivot */
@@ -997,6 +1001,7 @@ static void init_TransDataContainers(TransInfo *t,
 static TransConvertTypeInfo *convert_type_get(const TransInfo *t, Object **r_obj_armature)
 {
   ViewLayer *view_layer = t->view_layer;
+  BKE_view_layer_synced_ensure(t->scene, t->view_layer);
   Object *ob = BKE_view_layer_active_object_get(view_layer);
 
   /* if tests must match recalcData for correct updates */
@@ -1110,11 +1115,11 @@ static TransConvertTypeInfo *convert_type_get(const TransInfo *t, Object **r_obj
     }
     return NULL;
   }
-  if ((ob) && (ELEM(ob->mode,
-                    OB_MODE_PAINT_GPENCIL,
-                    OB_MODE_SCULPT_GPENCIL,
-                    OB_MODE_WEIGHT_GPENCIL,
-                    OB_MODE_VERTEX_GPENCIL))) {
+  if (ob && ELEM(ob->mode,
+                 OB_MODE_PAINT_GPENCIL,
+                 OB_MODE_SCULPT_GPENCIL,
+                 OB_MODE_WEIGHT_GPENCIL,
+                 OB_MODE_VERTEX_GPENCIL)) {
     /* In grease pencil all transformations must be canceled if not Object or Edit. */
     return NULL;
   }
@@ -1140,8 +1145,8 @@ void createTransData(bContext *C, TransInfo *t)
     init_TransDataContainers(t, ob_armature, &ob_armature, 1);
   }
   else {
-    ViewLayer *view_layer = t->view_layer;
-    Object *ob = BKE_view_layer_active_object_get(view_layer);
+    BKE_view_layer_synced_ensure(t->scene, t->view_layer);
+    Object *ob = BKE_view_layer_active_object_get(t->view_layer);
     init_TransDataContainers(t, ob, NULL, 0);
   }
 
@@ -1230,8 +1235,8 @@ void transform_convert_clip_mirror_modifier_apply(TransDataContainer *tc)
           if (mmd->mirror_ob) {
             float obinv[4][4];
 
-            invert_m4_m4(obinv, mmd->mirror_ob->obmat);
-            mul_m4_m4m4(mtx, obinv, ob->obmat);
+            invert_m4_m4(obinv, mmd->mirror_ob->object_to_world);
+            mul_m4_m4m4(mtx, obinv, ob->object_to_world);
             invert_m4_m4(imtx, mtx);
           }