From c6d073f6a4e7e455b5891359e65fdffbb74a0887 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 1 Jul 2019 16:51:00 +0200 Subject: Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both. --- source/blender/editors/object/object_intern.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/object/object_intern.h') 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 */ -- cgit v1.2.3