diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-01 17:51:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-01 17:53:41 +0300 |
| commit | c6d073f6a4e7e455b5891359e65fdffbb74a0887 (patch) | |
| tree | 8466f5cd3d897c233ff4b8111a0d61886558679b /source/blender/editors/object/object_intern.h | |
| parent | 510daea5455ad752ba2d9c97836bbcb54c8054ce (diff) | |
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'."
This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9.
We are in UI and API freeze, and this changes both.
Diffstat (limited to 'source/blender/editors/object/object_intern.h')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |