Revert "Rename operator 'Join Shapes' to 'Transfer Mix'."

This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9.
We are in UI and API freeze, and this changes both.

3 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 468efc0c9d9..0fdb1cec16f 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2782,10 +2782,10 @@ void OBJECT_OT_join(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Transfer Mix Operator for Shape Keys
+/** \name Join as Shape Key Operator
  * \{ */
 
-static bool shape_key_transfer_mix_poll(bContext *C)
+static bool join_shapes_poll(bContext *C)
 {
   Object *ob = CTX_data_active_object(C);
 
@@ -2802,12 +2802,12 @@ static bool shape_key_transfer_mix_poll(bContext *C)
   }
 }
 
-static int shape_key_transfer_mix_exec(bContext *C, wmOperator *op)
+static int join_shapes_exec(bContext *C, wmOperator *op)
 {
   Object *ob = CTX_data_active_object(C);
 
   if (ob->mode & OB_MODE_EDIT) {
-    BKE_report(op->reports, RPT_ERROR, "Shape Keys cannot be transfered in edit mode");
+    BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
     return OPERATOR_CANCELLED;
   }
   else if (BKE_object_obdata_is_libdata(ob)) {
@@ -2822,16 +2822,16 @@ static int shape_key_transfer_mix_exec(bContext *C, wmOperator *op)
   return OPERATOR_CANCELLED;
 }
 
-void OBJECT_OT_shape_key_transfer_mix(wmOperatorType *ot)
+void OBJECT_OT_join_shapes(wmOperatorType *ot)
 {
   /* identifiers */
-  ot->name = "Transfer Mix";
-  ot->description = "Copy the current resulting shape of another selected object to this one";
-  ot->idname = "OBJECT_OT_shape_key_transfer_mix";
+  ot->name = "Join as Shapes";
+  ot->description = "Merge selected objects to shapes of active object";
+  ot->idname = "OBJECT_OT_join_shapes";
 
   /* api callbacks */
-  ot->exec = shape_key_transfer_mix_exec;
-  ot->poll = shape_key_transfer_mix_poll;
+  ot->exec = join_shapes_exec;
+  ot->poll = join_shapes_poll;
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index f97a9c1b5b8..b9350052093 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -117,7 +117,7 @@ void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot);
 void OBJECT_OT_duplicate(struct wmOperatorType *ot);
 void OBJECT_OT_delete(struct wmOperatorType *ot);
 void OBJECT_OT_join(struct wmOperatorType *ot);
-void OBJECT_OT_shape_key_transfer_mix(struct wmOperatorType *ot);
+void OBJECT_OT_join_shapes(struct wmOperatorType *ot);
 void OBJECT_OT_convert(struct wmOperatorType *ot);
 
 /* object_hook.c */
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 217a2e5a54d..b653c7fa70c 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -117,7 +117,7 @@ void ED_operatortypes_object(void)
   WM_operatortype_append(OBJECT_OT_duplicates_make_real);
   WM_operatortype_append(OBJECT_OT_duplicate);
   WM_operatortype_append(OBJECT_OT_join);
-  WM_operatortype_append(OBJECT_OT_shape_key_transfer_mix);
+  WM_operatortype_append(OBJECT_OT_join_shapes);
   WM_operatortype_append(OBJECT_OT_convert);
 
   WM_operatortype_append(OBJECT_OT_modifier_add);