diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2019-06-30 21:05:54 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2019-06-30 21:07:17 +0300 |
| commit | 741967079c393a9eb6babd60c92a716fafa5d3e9 (patch) | |
| tree | e92318c56d905ab30ef6c8ce17d0c82d34e58f0c /source/blender/editors/object/object_intern.h | |
| parent | 7c8bf77e1351f5e44b28cb930c3b4c46589bc5ae (diff) | |
Rename operator 'Join Shapes' to 'Transfer Mix'.
The new name is consistent with the 'Transfer Shape' operator.
- Updated the UI descriptions for both transfer operators.
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 b9350052093..f97a9c1b5b8 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_join_shapes(struct wmOperatorType *ot); +void OBJECT_OT_shape_key_transfer_mix(struct wmOperatorType *ot); void OBJECT_OT_convert(struct wmOperatorType *ot); /* object_hook.c */ |