diff --git a/CMakeLists.txt b/CMakeLists.txt index 89a2e2f4a66..61b6bee66d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -989,7 +989,7 @@ endif() option(WITH_STRSIZE_DEBUG "\ Ensure string operations on fixed size buffers \ -(works well with with \"WITH_COMPILER_ASAN\" & valgrind to detect incorrect buffer size arguments)" +(works well with \"WITH_COMPILER_ASAN\" & valgrind to detect incorrect buffer size arguments)" OFF) mark_as_advanced(WITH_STRSIZE_DEBUG) diff --git a/scripts/modules/addon_utils.py b/scripts/modules/addon_utils.py index 71bdbfecc79..e7d1f80cd5c 100644 --- a/scripts/modules/addon_utils.py +++ b/scripts/modules/addon_utils.py @@ -823,7 +823,7 @@ def _stale_pending_check_and_remove_once(): if stale_handle.is_modified(): stale_handle.state_store(check_exists=False) except Exception as ex: - print("Unexpected error clearing stale data, this is is a bug!", str(ex)) + print("Unexpected error clearing stale data, this is a bug!", str(ex)) if is_empty: try: @@ -1126,7 +1126,7 @@ def _initialize_extensions_compat_ensure_up_to_date(extensions_directory, extens if _extension_compat_cache_update_needed(cache_data, blender_id, extensions_enabled, print_debug): cache_data = None except Exception: - print("Extension: unexpected error reading cache, this is is a bug! (regenerating)") + print("Extension: unexpected error reading cache, this is a bug! (regenerating)") import traceback traceback.print_exc() cache_data = None @@ -1217,7 +1217,7 @@ def _initialize_extensions_compat_data( print_debug, ) except Exception: - print("Extension: unexpected error detecting cache, this is is a bug!") + print("Extension: unexpected error detecting cache, this is a bug!") import traceback traceback.print_exc() updated = False @@ -1236,7 +1236,7 @@ def _initialize_extensions_compat_data( error_fn=error_fn, ) except Exception: - print("Extension: unexpected error updating wheels, this is is a bug!") + print("Extension: unexpected error updating wheels, this is a bug!") import traceback traceback.print_exc() diff --git a/source/blender/blenkernel/BKE_path_templates.hh b/source/blender/blenkernel/BKE_path_templates.hh index e188f1772f7..0536842bb21 100644 --- a/source/blender/blenkernel/BKE_path_templates.hh +++ b/source/blender/blenkernel/BKE_path_templates.hh @@ -232,7 +232,7 @@ void BKE_report_path_template_errors(ReportList *reports, * Format the given floating point value with the provided format specifier. The format specifier * is e.g. the "##.###" in "{name:##.###}". * - * \return Nullopt if the format specifier is invalid. + * \return #std::nullopt if the format specifier is invalid. */ std::optional BKE_path_template_format_float(blender::StringRef format_specifier, double value); diff --git a/source/blender/blenkernel/intern/mesh_data_update.cc b/source/blender/blenkernel/intern/mesh_data_update.cc index 39f07939d14..b146df33bc2 100644 --- a/source/blender/blenkernel/intern/mesh_data_update.cc +++ b/source/blender/blenkernel/intern/mesh_data_update.cc @@ -1171,7 +1171,7 @@ Mesh *mesh_get_eval_deform(Depsgraph *depsgraph, /* There is no such a concept as deformed mesh in edit mode. * Explicitly disallow this request so that the evaluated result is not modified with evaluated * result from the wrong mode. */ - BLI_assert_msg(0, "Request of derformed mesh of object which is in edit mode"); + BLI_assert_msg(0, "Request of deformed mesh of object which is in edit mode"); return nullptr; } diff --git a/source/blender/draw/intern/draw_context.cc b/source/blender/draw/intern/draw_context.cc index 63ed2488efa..450f440bf2f 100644 --- a/source/blender/draw/intern/draw_context.cc +++ b/source/blender/draw/intern/draw_context.cc @@ -1135,7 +1135,7 @@ static void drw_callbacks_pre_scene_2D(DRWContext &draw_ctx) DRW_submission_end(); } - /* State is reset later at the begining of `draw_ctx.engines_draw_scene()`. */ + /* State is reset later at the beginning of `draw_ctx.engines_draw_scene()`. */ } static void drw_callbacks_post_scene_2D(DRWContext &draw_ctx, View2D &v2d) diff --git a/source/blender/editors/physics/rigidbody_world.cc b/source/blender/editors/physics/rigidbody_world.cc index 4cb01700a6a..b07d13f9527 100644 --- a/source/blender/editors/physics/rigidbody_world.cc +++ b/source/blender/editors/physics/rigidbody_world.cc @@ -179,8 +179,8 @@ void RIGIDBODY_OT_world_export(wmOperatorType *ot) ot->idname = "RIGIDBODY_OT_world_export"; ot->name = "Export Rigid Body World"; ot->description = - "Export Rigid Body world to the simulator's own fileformat (i.e. '.bullet' for Bullet " - "Physics)"; + "Export Rigid Body world to the simulator's own file-format " + "(i.e. '.bullet' for Bullet Physics)"; /* callbacks */ ot->invoke = rigidbody_world_export_invoke; diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 4aeaa7e8935..aaa747d3468 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -5136,7 +5136,7 @@ static void SCREEN_OT_header_toggle_menus(wmOperatorType *ot) /* identifiers */ ot->name = "Expand/Collapse Header Menus"; ot->idname = "SCREEN_OT_header_toggle_menus"; - ot->description = "Expand or collapse the header pulldown menus"; + ot->description = "Expand or collapse the header pull-down menus"; /* API callbacks. */ ot->exec = header_toggle_menus_exec; diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 83fadf58c98..4f7c5aea8a7 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -769,7 +769,7 @@ static wmOperatorStatus sample_color_modal(bContext *C, wmOperator *op, const wm if (!data->sample_palette) { data->sample_palette = true; sample_color_update_header(data, C); - BKE_report(op->reports, RPT_INFO, "Sampling color for pallette"); + BKE_report(op->reports, RPT_INFO, "Sampling color for palette"); } WM_event_add_notifier(C, NC_BRUSH | NA_EDITED, brush); } diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh index 87f7c52627f..d14b577e564 100644 --- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh +++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh @@ -783,7 +783,7 @@ class Preprocessor { const string ns_keyword = "namespace "; size_t pos = out_str.rfind(ns_keyword, out_str.size() - parent_scope.size()); if (pos == string::npos) { - report_error(match, "Couldn't find `namespace` keyword at begining of scope."); + report_error(match, "Couldn't find `namespace` keyword at beginning of scope."); break; } size_t start = pos + ns_keyword.size(); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 746b9221f86..c400b7933d1 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -8336,8 +8336,8 @@ static void def_cmp_color_spill(BlenderRNA * /*brna*/, StructRNA *srna) "rna_node_property_to_input_setter"); RNA_def_property_ui_text(prop, "Unspill", - "Compensate all channels (differently) by hand. (Deprecated: Use Use " - "Spill Strength input instead.)"); + "Compensate all channels (differently) by hand. " + "(Deprecated: Use \"Use Spill Strength\" input instead.)"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "unspill_red", PROP_FLOAT, PROP_NONE); @@ -9472,7 +9472,7 @@ static void def_cmp_zcombine(BlenderRNA * /*brna*/, StructRNA *srna) RNA_def_property_ui_text(prop, "Use Alpha", "Take alpha channel into account when doing the Z operation. " - "(Deprecated: Use Use Alpha input instead.)"); + "(Deprecated: Use \"Use Alpha\" input instead.)"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "use_antialias_z", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_rna.cc b/source/blender/makesrna/intern/rna_rna.cc index 218fe235d2c..27eb4ef6359 100644 --- a/source/blender/makesrna/intern/rna_rna.cc +++ b/source/blender/makesrna/intern/rna_rna.cc @@ -173,7 +173,7 @@ static constexpr auto PROP_PROPORTIONAL_DESCR = ""; static constexpr auto PROP_TEXTEDIT_UPDATE_DESCR = ""; static constexpr auto PROP_PATH_OUTPUT_DESCR = ""; static constexpr auto PROP_PATH_RELATIVE_DESCR = - "This path supports relative prefix \"//\" which is expanded the the directory " + "This path supports relative prefix \"//\" which is expanded the directory " "where the current \".blend\" file is located."; static constexpr auto PROP_PATH_SUPPORTS_TEMPLATES_DESCR = "This path supports the \"{variable_name}\" template syntax, which substitutes the " diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc index 6e8eb19f425..ae442e13131 100644 --- a/source/blender/makesrna/intern/rna_ui.cc +++ b/source/blender/makesrna/intern/rna_ui.cc @@ -1677,8 +1677,8 @@ static void rna_def_ui_layout(BlenderRNA *brna) {int(blender::ui::EmbossType::Pulldown), "PULLDOWN_MENU", 0, - "Pulldown Menu", - "Draw pulldown menu style"}, + "Pull-down Menu", + "Draw pull-down menu style"}, {int(blender::ui::EmbossType::PieMenu), "RADIAL_MENU", 0, diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index a79ee255304..e7a237c1e5c 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -5272,7 +5272,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Open on Mouse Over", - "Open menu buttons and pulldowns automatically when the mouse is hovering"); + "Open menu buttons and pull-downs automatically when the mouse is hovering"); prop = RNA_def_property(srna, "open_toplevel_delay", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, nullptr, "menuthreshold1"); diff --git a/source/blender/nodes/function/nodes/node_fn_format_string.cc b/source/blender/nodes/function/nodes/node_fn_format_string.cc index 9482b004547..232cfa4ecad 100644 --- a/source/blender/nodes/function/nodes/node_fn_format_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_format_string.cc @@ -369,7 +369,7 @@ static std::optional preprocess_python_compatib { const FormatPatternInfo *allowed_pattern = get_pattern_by_type(type); if (!allowed_pattern) { - /* The type can't be formatted. The user shouln't be able to trigger this error but nice to + /* The type can't be formatted. The user shouldn't be able to trigger this error but nice to * handle it anyway. */ if (!r_error) { r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" can't be formatted")), type.name()); @@ -480,7 +480,7 @@ static void format_with_fmt(const fmt::format_string<> format, } } catch (const fmt::format_error &error) { - /* Invalid patterns should have been caughed before already. */ + /* Invalid patterns should have been caught before already. */ BLI_assert_unreachable(); } }); diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 46eb1d059bf..699fa9f8bf9 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1113,8 +1113,8 @@ static int arg_handle_command_set(int argc, const char **argv, void *data) static const char arg_handle_disable_depsgraph_on_file_load_doc[] = "\n" - "\tBackround mode: Do not systematically build and evaluate ViewLayers' dependency graphs\n" - "\twhen loading a blendfile in background mode (`-b` or `-c` options).\n" + "\tBackground mode: Do not systematically build and evaluate ViewLayers' dependency graphs\n" + "\twhen loading a blend-file in background mode (`-b` or `-c` options).\n" "\n" "\tScripts requiring evaluated data then need to explicitly ensure that\n" "\tan evaluated depsgraph is available\n" @@ -1132,7 +1132,7 @@ static int arg_handle_disable_depsgraph_on_file_load(int /*argc*/, static const char arg_handle_disable_liboverride_auto_resync_doc[] = "\n" - "\tDo not perform library override automatic resync when loading a new blendfile.\n" + "\tDo not perform library override automatic resync when loading a new blend-file.\n" "\n" "\tNOTE: this is an alternative way to get the same effect as when setting the\n" "\t`No Override Auto Resync` User Preferences Debug option."; diff --git a/tools/utils_doc/code_layout_diagram.py b/tools/utils_doc/code_layout_diagram.py index 7fa58b9a6d3..27c58ff86bc 100644 --- a/tools/utils_doc/code_layout_diagram.py +++ b/tools/utils_doc/code_layout_diagram.py @@ -311,7 +311,7 @@ SECTIONS = ( "Bi-directional text support (right-to-left) for Arabic & Hebrew script. " "Intended for complex text shaping (not yet supported)."), ("gmp", "Arbitrary precision arithmetic library."), - ("harfbuzz", "Text shaping engine for for complex script."), + ("harfbuzz", "Text shaping engine for complex script."), ("haru", "PDF generation library."), ("hiprt", "Ray-tracing for AMD GPU's. Used by Cycles."), ("imath", "Library used by OpenEXR image-format."),