diff options
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/object.py | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
5 files changed, 2 insertions, 3 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject d1f85e37b7fa2574243a112670fd36fbebc61d4 +Subproject 6a6b84fd50538a65276c729b5d396be615bc79f diff --git a/release/scripts/addons b/release/scripts/addons -Subproject ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a +Subproject 16040b3f21b285dbe98847636cafd5eddfd0c71 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject e83541d42c71bfb689acf9a53a6eb66b0c19045 +Subproject f00d4fbe84852e40af281267c06dc21bafb5df4 diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 481b101eaee..e4f8daa9c4b 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -312,8 +312,7 @@ class SubdivisionSet(Operator): class ShapeTransfer(Operator): - """Copy another selected objects active shape to this one by """ \ - """applying the relative offsets""" + """Copy the active shape key of another selected object to this one""" bl_idname = "object.shape_key_transfer" bl_label = "Transfer Shape Key" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 0fdb1cec16f..a3e3196bb13 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2826,7 +2826,7 @@ void OBJECT_OT_join_shapes(wmOperatorType *ot) { /* identifiers */ ot->name = "Join as Shapes"; - ot->description = "Merge selected objects to shapes of active object"; + ot->description = "Copy the current resulting shape of another selected object to this one"; ot->idname = "OBJECT_OT_join_shapes"; /* api callbacks */ |