[Bf-blender-cvs] [8dd3387eb74] master: Cleanup: spelling & poor wording in code & comments

Campbell Barton noreply at git.blender.org
Wed Apr 6 11:09:52 CEST 2022


Commit: 8dd3387eb74566f6c52d5c83f22a8e89a908df2a
Author: Campbell Barton
Date:   Wed Apr 6 19:08:10 2022 +1000
Branches: master
https://developer.blender.org/rB8dd3387eb74566f6c52d5c83f22a8e89a908df2a

Cleanup: spelling & poor wording in code & comments

===================================================================

M	release/scripts/modules/bpy_types.py
M	source/blender/blenkernel/intern/bvhutils.cc
M	source/blender/editors/mesh/editmesh_knife.c
M	source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
M	source/blender/python/intern/bpy_capi_utils.c

===================================================================

diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 45fd6d29dfa..be60a1711aa 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -9,7 +9,7 @@ StructMetaPropGroup = bpy_types.bpy_struct_meta_idprop
 # StructRNA = bpy_types.Struct
 
 # Private dummy object use for comparison only.
-_sentinal = object()
+_sentinel = object()
 
 # Note that methods extended in C are defined in: 'bpy_rna_types_capi.c'
 
@@ -51,8 +51,8 @@ class Context(StructRNA):
         # Retrieve the value for `attr`.
         # Match the value error exception with that of "path_resolve"
         # to simplify exception handling for the caller.
-        value = getattr(self, attr, _sentinal)
-        if value is _sentinal:
+        value = getattr(self, attr, _sentinel)
+        if value is _sentinel:
             raise ValueError("Path could not be resolved: %r" % attr)
 
         if value is None:
diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc
index d2e1c04a923..df266029506 100644
--- a/source/blender/blenkernel/intern/bvhutils.cc
+++ b/source/blender/blenkernel/intern/bvhutils.cc
@@ -562,7 +562,7 @@ static void mesh_edges_spherecast(void *userdata,
  */
 
 /* -------------------------------------------------------------------- */
-/** \name Commom Utils
+/** \name Common Utils
  * \{ */
 
 static void bvhtree_from_mesh_setup_data(BVHTree *tree,
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 73716f6edba..ee40431c101 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -4399,7 +4399,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
         knifetool_exit(op);
         ED_workspace_status_text(C, NULL);
 
-        /* Exit early to prevent undo push for empty cuts. */
+        /* Cancel to prevent undo push for empty cuts. */
         if (kcd->totkvert == 0) {
           return OPERATOR_CANCELLED;
         }
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
index e2cdb4c0721..2a838215421 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
@@ -61,7 +61,7 @@ class MeshFromGeometry : NonMovable, NonCopyable {
    */
   void create_uv_verts(Mesh *mesh);
   /**
-   * Add materials and the nodetree to the Mesh Object.
+   * Add materials and the node-tree to the Mesh Object.
    */
   void create_materials(Main *bmain,
                         const Map<std::string, std::unique_ptr<MTLMaterial>> &materials,
diff --git a/source/blender/python/intern/bpy_capi_utils.c b/source/blender/python/intern/bpy_capi_utils.c
index f7f8253edac..59b0fded445 100644
--- a/source/blender/python/intern/bpy_capi_utils.c
+++ b/source/blender/python/intern/bpy_capi_utils.c
@@ -69,8 +69,7 @@ bool BPy_errors_to_report_ex(ReportList *reports,
     return 0;
   }
 
-  /* Trim trailing newlines so the report doesn't contain a trailing new-line.
-   * This would add a blank-line in the info space. */
+  /* Strip trailing newlines so the report doesn't show a blank-line in the info space. */
   Py_ssize_t err_str_len;
   const char *err_str = PyUnicode_AsUTF8AndSize(err_str_py, &err_str_len);
   while (err_str_len > 0 && err_str[err_str_len - 1] == '\n') {



More information about the Bf-blender-cvs mailing list