diff options
author | Bastien Montagne <bastien@blender.org> | 2021-10-04 12:08:33 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-10-04 12:14:57 +0300 |
commit | 87a3cb3bffd810f71c9af114a5b8fe8d4f029cf7 (patch) | |
tree | 3dc789e02ab07eb3879497cbed15fc6935f42a87 /source/blender/editors/armature | |
parent | 8c55333a8e8082ff6766b91d2cbfa74e510e9739 (diff) |
Cleanup: `Neighbour` -> `Neighbor`. and other minor UI messages fixes.
Blender English should use 'American' variants, not 'British' variants.
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/armature_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_slide.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 696355324e6..3a6761ba915 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -216,7 +216,7 @@ void POSE_OT_relax(struct wmOperatorType *ot); void POSE_OT_push_rest(struct wmOperatorType *ot); void POSE_OT_relax_rest(struct wmOperatorType *ot); void POSE_OT_breakdown(struct wmOperatorType *ot); -void POSE_OT_blend_to_neighbours(struct wmOperatorType *ot); +void POSE_OT_blend_to_neighbors(struct wmOperatorType *ot); void POSE_OT_propagate(struct wmOperatorType *ot); diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index a1070a8823a..75b0455d026 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -150,7 +150,7 @@ void ED_operatortypes_armature(void) WM_operatortype_append(POSE_OT_push_rest); WM_operatortype_append(POSE_OT_relax_rest); WM_operatortype_append(POSE_OT_breakdown); - WM_operatortype_append(POSE_OT_blend_to_neighbours); + WM_operatortype_append(POSE_OT_blend_to_neighbors); } void ED_operatormacros_armature(void) diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index b273d3aac76..ed8a35f779b 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -914,7 +914,7 @@ static void pose_slide_draw_status(bContext *C, tPoseSlideOp *pso) strcpy(mode_str, TIP_("Breakdown")); break; case POSESLIDE_BLEND: - strcpy(mode_str, TIP_("Blend To Neighbour")); + strcpy(mode_str, TIP_("Blend To Neighbor")); break; default: @@ -1709,7 +1709,7 @@ void POSE_OT_breakdown(wmOperatorType *ot) } /* ........................ */ -static int pose_slide_blend_to_neighbours_invoke(bContext *C, wmOperator *op, const wmEvent *event) +static int pose_slide_blend_to_neighbors_invoke(bContext *C, wmOperator *op, const wmEvent *event) { /* Initialize data. */ if (pose_slide_init(C, op, POSESLIDE_BLEND) == 0) { @@ -1721,7 +1721,7 @@ static int pose_slide_blend_to_neighbours_invoke(bContext *C, wmOperator *op, co return pose_slide_invoke_common(C, op, event); } -static int pose_slide_blend_to_neighbours_exec(bContext *C, wmOperator *op) +static int pose_slide_blend_to_neighbors_exec(bContext *C, wmOperator *op) { tPoseSlideOp *pso; @@ -1737,16 +1737,16 @@ static int pose_slide_blend_to_neighbours_exec(bContext *C, wmOperator *op) return pose_slide_exec_common(C, op, pso); } -void POSE_OT_blend_to_neighbours(wmOperatorType *ot) +void POSE_OT_blend_to_neighbors(wmOperatorType *ot) { /* Identifiers. */ - ot->name = "Blend To Neighbour"; - ot->idname = "POSE_OT_blend_to_neighbour"; + ot->name = "Blend To Neighbor"; + ot->idname = "POSE_OT_blend_to_neighbor"; ot->description = "Blend from current position to previous or next keyframe"; /* Callbacks. */ - ot->exec = pose_slide_blend_to_neighbours_exec; - ot->invoke = pose_slide_blend_to_neighbours_invoke; + ot->exec = pose_slide_blend_to_neighbors_exec; + ot->invoke = pose_slide_blend_to_neighbors_invoke; ot->modal = pose_slide_modal; ot->cancel = pose_slide_cancel; ot->poll = ED_operator_posemode; |