Merge branch 'blender-v2.83-release'

3 files changed, 7 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index d73f92b6073..a3e1eeb89c7 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1134,17 +1134,18 @@ static void curve_calc_modifiers_post(Depsgraph *depsgraph,
 
   if (r_final) {
     if (force_mesh_conversion && !modified) {
-      /* XXX 2.8 : This is a workaround for by some deeper technical depts:
+      /* XXX 2.8 : This is a workaround for by some deeper technical debts:
        * - DRW Batch cache is stored inside the ob->data.
        * - Curve data is not COWed for instances that use different modifiers.
-       * This can causes the modifiers to be applied on all user of the same datablock (see T71055)
+       * This can causes the modifiers to be applied on all user of the same data-block
+       * (see T71055)
        *
        * The easy workaround is to force to generate a Mesh that will be used for display data
        * since a Mesh output is already used for generative modifiers.
        * However it does not fix problems with actual edit data still being shared.
        *
-       * The right solution would be to COW the Curve data block at the input of the modifer stack
-       * just like what the mesh modifier does.
+       * The right solution would be to COW the Curve data block at the input of the modifier
+       * stack just like what the mesh modifier does.
        * */
       modified = BKE_mesh_new_nomain_from_curve_displist(ob, dispbase);
     }
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index c2b771088a8..634e29ca400 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -732,7 +732,7 @@ static bool brush_generic_tool_set(bContext *C,
 
     /* Tool System
      * This is needed for when there is a non-sculpt tool active (transform for e.g.).
-     * In case we are toogling (and the brush changed to the toggle_brush), we need to get the
+     * In case we are toggling (and the brush changed to the toggle_brush), we need to get the
      * tool_name again. */
     int tool_result = brush_tool(brush, paint->runtime.tool_offset);
     ePaintMode paint_mode = BKE_paintmode_get_active_from_context(C);
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index deeb4f5789c..6749aa9495a 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -450,7 +450,7 @@ static const EnumPropertyItem operator_flag_items[] = {
      "UNDO_GROUPED",
      0,
      "Grouped Undo",
-     "Push a single undo event for repetead instances of this operator"},
+     "Push a single undo event for repeated instances of this operator"},
     {OPTYPE_BLOCKING, "BLOCKING", 0, "Blocking", "Block anything else from using the cursor"},
     {OPTYPE_MACRO, "MACRO", 0, "Macro", "Use to check if an operator is a macro"},
     {OPTYPE_GRAB_CURSOR_XY,