Merge branch 'blender-v4.3-release'

2024-10-23 12:29:55 +11:00
parent 6cc4e51e0a ef6a035884
commit 1d1da80c08
1 changed files with 5 additions and 0 deletions
--- a/source/blender/editors/object/object_modes.cc
+++ b/source/blender/editors/object/object_modes.cc
@@ -468,6 +468,11 @@ static int object_transfer_mode_invoke(bContext *C, wmOperator *op, const wmEven
  }

  Object *ob_dst = base_dst->object;
+
+  if (ob_src == ob_dst) {
+    return OPERATOR_CANCELLED;
+  }
+
  BLI_assert(ob_dst->id.orig_id == nullptr);
  if (!ID_IS_EDITABLE(ob_dst) || !ID_IS_EDITABLE(ob_src)) {
    BKE_reportf(op->reports,