blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Updated tooltips for operators 'Transfer Mix' and 'Join Shapes'. Fixes typo

This commit is contained in:
Inês Almeida 2019-07-01 23:06:32 +02:00
parent fcc567b797
commit 9fbfa218e0
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
Subproject commit 6a6b84fd50538a65276c729b5d396be615bc79f2

2
release/scripts/addons

@ -1 +1 @@
Subproject commit ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a8
Subproject commit 16040b3f21b285dbe98847636cafd5eddfd0c71a

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
Subproject commit f00d4fbe84852e40af281267c06dc21bafb5df49

3
release/scripts/startup/bl_operators/object.py
View File

@ -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"

2
source/blender/editors/object/object_add.c
View File

@ -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 */