1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 36dc01fc9c6..2f3b50a7c1a 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1660,8 +1660,15 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
       orient_type_scene += index_custom;
     }
 
-    short orient_type_default = V3D_ORIENT_VIEW;
+    short orient_type_default;
     short orient_type_constraint[2];
+    if ((t->flag & T_MODAL) && transform_mode_is_changeable(t->mode)) {
+      /* During modal, rotation starts with the View orientation. */
+      orient_type_default = V3D_ORIENT_VIEW;
+    }
+    else {
+      orient_type_default = orient_type_scene;
+    }
 
     if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
       t->orient_axis = RNA_property_enum_get(op->ptr, prop);