Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-07-01 17:51:00 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-07-01 17:53:41 +0300
commitc6d073f6a4e7e455b5891359e65fdffbb74a0887 (patch)
tree8466f5cd3d897c233ff4b8111a0d61886558679b /release/scripts/startup/bl_ui/properties_data_mesh.py
parent510daea5455ad752ba2d9c97836bbcb54c8054ce (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 'release/scripts/startup/bl_ui/properties_data_mesh.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_mesh.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 5be0a5dba37..e4fd09bb5ff 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -67,8 +67,8 @@ class MESH_MT_shape_key_context_menu(Menu):
layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT').use_topology = False
layout.operator("object.shape_key_mirror", text="Mirror Shape Key (Topology)").use_topology = True
layout.separator()
- layout.operator("object.shape_key_transfer_mix")
- layout.operator("object.shape_key_transfer_active")
+ layout.operator("object.join_shapes")
+ layout.operator("object.shape_key_transfer")
layout.separator()
layout.operator("object.shape_key_remove", icon='X', text="Delete All Shape Keys").all = True
layout.separator()