diff options
author | Ines Almeida <britalmeida@gmail.com> | 2019-06-30 21:05:54 +0300 |
---|---|---|
committer | Ines Almeida <britalmeida@gmail.com> | 2019-06-30 21:07:17 +0300 |
commit | 741967079c393a9eb6babd60c92a716fafa5d3e9 (patch) | |
tree | e92318c56d905ab30ef6c8ce17d0c82d34e58f0c | |
parent | 7c8bf77e1351f5e44b28cb930c3b4c46589bc5ae (diff) |
Rename operator 'Join Shapes' to 'Transfer Mix'.
The new name is consistent with the 'Transfer Shape' operator.
- Updated the UI descriptions for both transfer operators.
-rw-r--r-- | release/scripts/startup/bl_operators/object.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_add.c | 20 | ||||
-rw-r--r-- | source/blender/editors/object/object_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_ops.c | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 481b101eaee..3c8fb1a4274 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -312,10 +312,9 @@ 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_idname = "object.shape_key_transfer_active" bl_label = "Transfer Shape Key" bl_options = {'REGISTER', 'UNDO'} diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index e4fd09bb5ff..5be0a5dba37 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.join_shapes") - layout.operator("object.shape_key_transfer") + layout.operator("object.shape_key_transfer_mix") + layout.operator("object.shape_key_transfer_active") layout.separator() layout.operator("object.shape_key_remove", icon='X', text="Delete All Shape Keys").all = True layout.separator() diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 0fdb1cec16f..468efc0c9d9 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2782,10 +2782,10 @@ void OBJECT_OT_join(wmOperatorType *ot) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Join as Shape Key Operator +/** \name Transfer Mix Operator for Shape Keys * \{ */ -static bool join_shapes_poll(bContext *C) +static bool shape_key_transfer_mix_poll(bContext *C) { Object *ob = CTX_data_active_object(C); @@ -2802,12 +2802,12 @@ static bool join_shapes_poll(bContext *C) } } -static int join_shapes_exec(bContext *C, wmOperator *op) +static int shape_key_transfer_mix_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); if (ob->mode & OB_MODE_EDIT) { - BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode"); + BKE_report(op->reports, RPT_ERROR, "Shape Keys cannot be transfered in edit mode"); return OPERATOR_CANCELLED; } else if (BKE_object_obdata_is_libdata(ob)) { @@ -2822,16 +2822,16 @@ static int join_shapes_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void OBJECT_OT_join_shapes(wmOperatorType *ot) +void OBJECT_OT_shape_key_transfer_mix(wmOperatorType *ot) { /* identifiers */ - ot->name = "Join as Shapes"; - ot->description = "Merge selected objects to shapes of active object"; - ot->idname = "OBJECT_OT_join_shapes"; + ot->name = "Transfer Mix"; + ot->description = "Copy the current resulting shape of another selected object to this one"; + ot->idname = "OBJECT_OT_shape_key_transfer_mix"; /* api callbacks */ - ot->exec = join_shapes_exec; - ot->poll = join_shapes_poll; + ot->exec = shape_key_transfer_mix_exec; + ot->poll = shape_key_transfer_mix_poll; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index b9350052093..f97a9c1b5b8 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -117,7 +117,7 @@ void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot); void OBJECT_OT_duplicate(struct wmOperatorType *ot); void OBJECT_OT_delete(struct wmOperatorType *ot); void OBJECT_OT_join(struct wmOperatorType *ot); -void OBJECT_OT_join_shapes(struct wmOperatorType *ot); +void OBJECT_OT_shape_key_transfer_mix(struct wmOperatorType *ot); void OBJECT_OT_convert(struct wmOperatorType *ot); /* object_hook.c */ diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index b653c7fa70c..217a2e5a54d 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -117,7 +117,7 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_duplicates_make_real); WM_operatortype_append(OBJECT_OT_duplicate); WM_operatortype_append(OBJECT_OT_join); - WM_operatortype_append(OBJECT_OT_join_shapes); + WM_operatortype_append(OBJECT_OT_shape_key_transfer_mix); WM_operatortype_append(OBJECT_OT_convert); WM_operatortype_append(OBJECT_OT_modifier_add); |