Updated tooltips for operators 'Transfer Mix' and 'Join Shapes'. Fixes typo
authorInes Almeida <britalmeida@gmail.com>
Mon, 1 Jul 2019 21:06:32 +0000 (23:06 +0200)
committerInes Almeida <britalmeida@gmail.com>
Mon, 1 Jul 2019 21:06:32 +0000 (23:06 +0200)
release/datafiles/locale
release/scripts/addons
release/scripts/addons_contrib
release/scripts/startup/bl_operators/object.py
source/blender/editors/object/object_add.c

index d1f85e37b7fa2574243a112670fd36fbebc61d4c..6a6b84fd50538a65276c729b5d396be615bc79f2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
+Subproject commit 6a6b84fd50538a65276c729b5d396be615bc79f2
index ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a8..16040b3f21b285dbe98847636cafd5eddfd0c71a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ae3237c4c5e6ba05c44fad5edd5fcd7e0b34b1a8
+Subproject commit 16040b3f21b285dbe98847636cafd5eddfd0c71a
index e83541d42c71bfb689acf9a53a6eb66b0c190451..f00d4fbe84852e40af281267c06dc21bafb5df49 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
+Subproject commit f00d4fbe84852e40af281267c06dc21bafb5df49
index 481b101eaeed8f5963a0f913a9bc98200bcdd995..e4f8daa9c4b901b955bf81522a8c3c3fbd757bdf 100644 (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"
index 0fdb1cec16fcde6e5d2ea83167be7d81aa1d2ca5..a3e3196bb13bded0389cbb3a9a13444c5fdd5ff3 100644 (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 */