From 1ac311cedc1a4694a3dd410776296747f8625e1d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 24 Dec 2018 12:31:39 +0100 Subject: Fix/cleanup another bunch of UI messages issues. Also (mostly in comments): behaviour -> behavior (we use American English). --- source/blender/editors/animation/anim_channels_edit.c | 2 +- source/blender/editors/animation/anim_filter.c | 2 +- source/blender/editors/animation/keyframing.c | 8 ++++---- source/blender/editors/gpencil/gpencil_brush.c | 4 ++-- source/blender/editors/gpencil/gpencil_select.c | 2 +- source/blender/editors/io/io_collada.c | 4 ++-- source/blender/editors/space_action/action_data.c | 2 +- source/blender/editors/space_nla/nla_channels.c | 2 +- source/blender/editors/transform/transform_conversions.c | 2 +- source/blender/editors/undo/ed_undo.c | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 2ace4874dae..26de5c3afc8 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -3058,7 +3058,7 @@ static void ANIM_OT_channels_click(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; /* properties */ - /* NOTE: don't save settings, otherwise, can end up with some weird behaviour (sticky extend) */ + /* NOTE: don't save settings, otherwise, can end up with some weird behavior (sticky extend) */ prop = RNA_def_boolean(ot->srna, "extend", false, "Extend Select", ""); // SHIFTKEY RNA_def_property_flag(prop, PROP_SKIP_SAVE); diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 2d528a0f0b9..1567c72c2b2 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -2991,7 +2991,7 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b * to make it easier to predict where items are in the hierarchy * - This order only really matters if we need to show all channels in the list (e.g. for drawing) * (XXX: What about lingering "active" flags? The order may now become unpredictable) - * - Don't do this if this behaviour has been turned off (i.e. due to it being too slow) + * - Don't do this if this behavior has been turned off (i.e. due to it being too slow) * - Don't do this if there's just a single object */ if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && !(ads->flag & ADS_FLAG_NO_DB_SORT) && diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index b93c2ae5c7b..02d5e2cb28a 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -479,7 +479,7 @@ int insert_vert_fcurve(FCurve *fcu, float x, float y, eBezTriple_KeyframeType ke /* set default handle types and interpolation mode */ if (flag & INSERTKEY_NO_USERPREF) { - /* for Py-API, we want scripts to have predictable behaviour, + /* for Py-API, we want scripts to have predictable behavior, * hence the option to not depend on the userpref defaults */ beztr.h1 = beztr.h2 = HD_AUTO_ANIM; @@ -1007,7 +1007,7 @@ bool insert_keyframe_direct(Depsgraph *depsgraph, ReportList *reports, PointerRN } } - /* update F-Curve flags to ensure proper behaviour for property type */ + /* update F-Curve flags to ensure proper behavior for property type */ update_autoflags_fcurve_direct(fcu, prop); /* adjust frame on which to add keyframe */ @@ -1949,9 +1949,9 @@ static int insert_key_button_exec(bContext *C, wmOperator *op) /* Special exception for keyframing transforms: * Set "group" for this manually, instead of having them appearing at the bottom (ungrouped) - * part of the channels list. Leaving these ungrouped is not a nice user behaviour in this case. + * part of the channels list. Leaving these ungrouped is not a nice user behavior in this case. * - * TODO: Perhaps we can extend this behaviour in future for other properties... + * TODO: Perhaps we can extend this behavior in future for other properties... */ if (ptr.type == &RNA_PoseBone) { bPoseChannel *pchan = (bPoseChannel *)ptr.data; diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index 5ec55d1e98e..2c2a4510295 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -224,13 +224,13 @@ static GP_Sculpt_Data *gpsculpt_get_brush(Scene *scene, bool is_weight_mode) /* Brush Operations ------------------------------- */ -/* Invert behaviour of brush? */ +/* Invert behavior of brush? */ static bool gp_brush_invert_check(tGP_BrushEditData *gso) { /* The basic setting is the brush's setting (from the panel) */ bool invert = ((gso->gp_brush->flag & GP_SCULPT_FLAG_INVERT) != 0); - /* During runtime, the user can hold down the Ctrl key to invert the basic behaviour */ + /* During runtime, the user can hold down the Ctrl key to invert the basic behavior */ if (gso->flag & GP_SCULPT_FLAG_INVERT) { invert ^= true; } diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 8b1f652f7c5..fff753cf3a9 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -1419,7 +1419,7 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - /* adjust selection behaviour - for toggle option */ + /* adjust selection behavior - for toggle option */ if (toggle) { deselect = (hit_point->flag & GP_SPOINT_SELECT) != 0; } diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 943f6743ec0..01cbeee7d28 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -456,7 +456,7 @@ void WM_OT_collada_export(wmOperatorType *ot) WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); RNA_def_enum(func, "prop_bc_export_ui_section", prop_bc_export_ui_section, 0, - "Export Section", "Only for User Interface Organisation"); + "Export Section", "Only for User Interface organization"); RNA_def_boolean(func, "apply_modifiers", 0, "Apply Modifiers", @@ -501,7 +501,7 @@ void WM_OT_collada_export(wmOperatorType *ot) "Keep Smooth curves", "Export also the curve handles (if available).\nThis does only work when the inverse parent matrix is the Unity matrix\nOtherwise you may end up with odd results\n"); RNA_def_boolean(func, "keep_keyframes", 0, - "Keep Keyframes", "Use existing keyframes as additional sample points.\nThis helps when you want to keep manual tweeks"); + "Keep Keyframes", "Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)"); RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map", "Export only the selected UV Map"); diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index a3773110d0f..fa5a13a81b6 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -647,7 +647,7 @@ static int action_unlink_exec(bContext *C, wmOperator *op) static int action_unlink_invoke(bContext *C, wmOperator *op, const wmEvent *evt) { - /* NOTE: this is hardcoded to match the behaviour for the unlink button (in interface_templates.c) */ + /* NOTE: this is hardcoded to match the behavior for the unlink button (in interface_templates.c) */ RNA_boolean_set(op->ptr, "force_delete", evt->shift != 0); return action_unlink_exec(C, op); } diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 0dae0e20319..2bd5bafe2d4 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -557,7 +557,7 @@ static int nla_action_unlink_exec(bContext *C, wmOperator *op) static int nla_action_unlink_invoke(bContext *C, wmOperator *op, const wmEvent *evt) { - /* NOTE: this is hardcoded to match the behaviour for the unlink button (in interface_templates.c) */ + /* NOTE: this is hardcoded to match the behavior for the unlink button (in interface_templates.c) */ RNA_boolean_set(op->ptr, "force_delete", evt->shift != 0); return nla_action_unlink_exec(C, op); } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index b04a9b08087..8c3187d92a0 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5059,7 +5059,7 @@ void flushTransGraphData(TransInfo *t) break; case SACTSNAP_TSTEP: /* second step */ - /* XXX: the handle behaviour in this case is still not quite right... */ + /* XXX: the handle behavior in this case is still not quite right... */ td2d->loc[0] = floor(((double)td2d->loc[0] / secf) + 0.5) * secf; td->loc[0] = floor(((double)td->loc[0] / secf) + 0.5) * secf; break; diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index dd459749029..9c29b370b92 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -206,7 +206,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname, ReportList if (G.debug & G_DEBUG_IO) { Main *bmain = CTX_data_main(C); if (bmain->lock != NULL) { - BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* undo step."); + BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* undo step"); BLO_main_validate_libraries(bmain, reports); } } -- cgit v1.2.3