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_operators/object.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_operators/object.py')
-rw-r--r--release/scripts/startup/bl_operators/object.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 3c8fb1a4274..481b101eaee 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -312,9 +312,10 @@ class SubdivisionSet(Operator):
class ShapeTransfer(Operator):
- """Copy the active shape key of another selected object to this one"""
+ """Copy another selected objects active shape to this one by """ \
+ """applying the relative offsets"""
- bl_idname = "object.shape_key_transfer_active"
+ bl_idname = "object.shape_key_transfer"
bl_label = "Transfer Shape Key"
bl_options = {'REGISTER', 'UNDO'}