blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: `Neighbour` -> `Neighbor`. and other minor UI messages fixes. 

Blender English should use 'American' variants, not 'British' variants.
This commit is contained in:
Bastien Montagne 2021-10-04 11:08:33 +02:00
parent 8c55333a8e
commit 87a3cb3bff
9 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/modules/bl_i18n_utils/utils_spell_check.py
View File

@ -176,6 +176,7 @@ class SpellChecker:
"precalculate",
"precomputing",
"prefetch",
"prefilter", "prefiltering",
"preload",
"premultiply", "premultiplied",
"prepass",
@ -225,6 +226,7 @@ class SpellChecker:
"subpath",
"subsize",
"substep", "substeps",
"substring",
"targetless",
"textbox", "textboxes",
"tilemode",
@ -731,6 +733,7 @@ class SpellChecker:
"tma",
"ui",
"unix",
"uuid",
"vbo", "vbos",
"vr",
"wxyz",

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -4312,7 +4312,7 @@ def km_pose(params):
("pose.push", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),
("pose.relax", {"type": 'E', "value": 'PRESS', "alt": True}, None),
("pose.breakdown", {"type": 'E', "value": 'PRESS', "shift": True}, None),
("pose.blend_to_neighbour", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, None),
("pose.blend_to_neighbor", {"type": 'E', "value": 'PRESS', "shift": True, "alt": True}, None),
op_menu("VIEW3D_MT_pose_propagate", {"type": 'P', "value": 'PRESS', "alt": True}),
*(
(("object.hide_collection",

4
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3443,7 +3443,7 @@ class VIEW3D_MT_pose_slide(Menu):
layout.operator("pose.push")
layout.operator("pose.relax")
layout.operator("pose.breakdown")
layout.operator("pose.blend_to_neighbour")
layout.operator("pose.blend_to_neighbor")
class VIEW3D_MT_pose_propagate(Menu):
@ -3596,7 +3596,7 @@ class VIEW3D_MT_pose_context_menu(Menu):
layout.operator("pose.push")
layout.operator("pose.relax")
layout.operator("pose.breakdown")
layout.operator("pose.blend_to_neighbour")
layout.operator("pose.blend_to_neighbor")
layout.separator()

2
source/blender/blenkernel/intern/gpencil_curve.c
View File

@ -1167,7 +1167,7 @@ void BKE_gpencil_editcurve_recalculate_handles(bGPDstroke *gps)
bGPDcurve_point *gpc_pt = &gpc->curve_points[i];
bGPDcurve_point *gpc_pt_prev = &gpc->curve_points[i - 1];
bGPDcurve_point *gpc_pt_next = &gpc->curve_points[i + 1];
/* update handle if point or neighbour is selected */
/* update handle if point or neighbor is selected */
if (gpc_pt->flag & GP_CURVE_POINT_SELECT || gpc_pt_prev->flag & GP_CURVE_POINT_SELECT ||
gpc_pt_next->flag & GP_CURVE_POINT_SELECT) {
BezTriple *bezt = &gpc_pt->bezt;

20
source/blender/editors/animation/keyframes_keylist.cc
View File

@ -564,9 +564,9 @@ static void nupdate_ak_masklayshape(ActKeyColumn *ak, void *data)
using KeylistCreateColumnFunction = std::function<ActKeyColumn *(void *userdata)>;
using KeylistUpdateColumnFunction = std::function<void(ActKeyColumn *, void *)>;
/* `ED_keylist_find_neighbour_front_to_back` is called before the runtime can be initialized so we
/* `ED_keylist_find_neighbor_front_to_back` is called before the runtime can be initialized so we
* cannot use bin searching. */
static ActKeyColumn *ED_keylist_find_neighbour_front_to_back(ActKeyColumn *cursor, float cfra)
static ActKeyColumn *ED_keylist_find_neighbor_front_to_back(ActKeyColumn *cursor, float cfra)
{
while (cursor->next && cursor->next->cfra <= cfra) {
cursor = cursor->next;
@ -574,9 +574,9 @@ static ActKeyColumn *ED_keylist_find_neighbour_front_to_back(ActKeyColumn *curso
return cursor;
}
/* `ED_keylist_find_neighbour_back_to_front` is called before the runtime can be initialized so we
/* `ED_keylist_find_neighbor_back_to_front` is called before the runtime can be initialized so we
* cannot use bin searching. */
static ActKeyColumn *ED_keylist_find_neighbour_back_to_front(ActKeyColumn *cursor, float cfra)
static ActKeyColumn *ED_keylist_find_neighbor_back_to_front(ActKeyColumn *cursor, float cfra)
{
while (cursor->prev && cursor->prev->cfra >= cfra) {
cursor = cursor->prev;
@ -585,14 +585,14 @@ static ActKeyColumn *ED_keylist_find_neighbour_back_to_front(ActKeyColumn *curso
}
/*
* `ED_keylist_find_exact_or_neighbour_column` is called before the runtime can be initialized so
* `ED_keylist_find_exact_or_neighbor_column` is called before the runtime can be initialized so
* we cannot use bin searching.
*
* This function is called to add or update columns in the keylist.
* Typically columns are sorted by frame number so keeping track of the last_accessed_column
* reduces searching.
*/
static ActKeyColumn *ED_keylist_find_exact_or_neighbour_column(AnimKeylist *keylist, float cfra)
static ActKeyColumn *ED_keylist_find_exact_or_neighbor_column(AnimKeylist *keylist, float cfra)
{
BLI_assert(!keylist->is_runtime_initialized);
if (ED_keylist_is_empty(keylist)) {
@ -604,10 +604,10 @@ static ActKeyColumn *ED_keylist_find_exact_or_neighbour_column(AnimKeylist *keyl
if (!is_cfra_eq(cursor->cfra, cfra)) {
const bool walking_direction_front_to_back = cursor->cfra <= cfra;
if (walking_direction_front_to_back) {
cursor = ED_keylist_find_neighbour_front_to_back(cursor, cfra);
cursor = ED_keylist_find_neighbor_front_to_back(cursor, cfra);
}
else {
cursor = ED_keylist_find_neighbour_back_to_front(cursor, cfra);
cursor = ED_keylist_find_neighbor_back_to_front(cursor, cfra);
}
}
@ -633,7 +633,7 @@ static void ED_keylist_add_or_update_column(AnimKeylist *keylist,
return;
}
ActKeyColumn *nearest = ED_keylist_find_exact_or_neighbour_column(keylist, cfra);
ActKeyColumn *nearest = ED_keylist_find_exact_or_neighbor_column(keylist, cfra);
if (is_cfra_eq(nearest->cfra, cfra)) {
update_func(nearest, userdata);
}
@ -774,7 +774,7 @@ static void add_bezt_to_keyblocks_list(AnimKeylist *keylist, BezTriple *bezt, co
if (is_cfra_lt(bezt[1].vec[1][0], bezt[0].vec[1][0])) {
/* Backtrack to find the right location. */
if (is_cfra_lt(bezt[1].vec[1][0], col->cfra)) {
ActKeyColumn *newcol = ED_keylist_find_exact_or_neighbour_column(keylist, col->cfra);
ActKeyColumn *newcol = ED_keylist_find_exact_or_neighbor_column(keylist, col->cfra);
BLI_assert(newcol);
BLI_assert(newcol->cfra == col->cfra);

2
source/blender/editors/armature/armature_intern.h
View File

@ -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);

2
source/blender/editors/armature/armature_ops.c
View File

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

16
source/blender/editors/armature/pose_slide.c
View File

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

4
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@ -2943,7 +2943,7 @@ static void rna_def_modifier_gpencilweight_angle(BlenderRNA *brna)
};
srna = RNA_def_struct(brna, "WeightAngleGpencilModifier", "GpencilModifier");
RNA_def_struct_ui_text(srna, "Weight Modifier Amgle", "Calculate Vertex Weight dynamically");
RNA_def_struct_ui_text(srna, "Weight Modifier Angle", "Calculate Vertex Weight dynamically");
RNA_def_struct_sdna(srna, "WeightAngleGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
@ -3589,7 +3589,7 @@ static void rna_def_modifier_gpencildash(BlenderRNA *brna)
prop = RNA_def_property(srna, "segment_active_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Active Dash Segement Index", "Active index in the segment list");
RNA_def_property_ui_text(prop, "Active Dash Segment Index", "Active index in the segment list");
prop = RNA_def_property(srna, "dash_offset", PROP_INT, PROP_NONE);
RNA_def_property_ui_text(