[Bf-blender-cvs] [a8fd3df9051] master: Cleanup: spelling

[Campbell Barton]

Commit: a8fd3df9051f6e57d552e0b77bbcad6685a2fb9a
Author: Campbell Barton
Date:   Tue Sep 15 10:23:41 2020 +1000
Branches: master
https://developer.blender.org/rBa8fd3df9051f6e57d552e0b77bbcad6685a2fb9a

Cleanup: spelling

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

M	intern/clog/clog.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/editors/transform/transform_convert_mesh.c
M	source/blender/gpu/opengl/gl_debug.cc

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

diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 15729f96ac7..37c8393f532 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -188,7 +188,7 @@ static void clg_str_vappendf(CLogStringBuf *cstr, const char *fmt, va_list args)
     va_end(args_cpy);
 
     if (retval < 0) {
-      /* Some encoding error happened, not much we can do here, besides skipping/cancelling this
+      /* Some encoding error happened, not much we can do here, besides skipping/canceling this
        * message. */
       break;
     }
@@ -199,7 +199,7 @@ static void clg_str_vappendf(CLogStringBuf *cstr, const char *fmt, va_list args)
     }
     else {
       /* vsnprintf was not successful, due to lack of allocated space, retval contains expected
-       * length of the formated string, use it to allocate required amount of memory. */
+       * length of the formatted string, use it to allocate required amount of memory. */
       uint len_alloc = cstr->len + (uint)retval;
       if (len_alloc >= len_max) {
         /* Safe upper-limit, just in case... */
@@ -291,7 +291,7 @@ static enum eCLogColor clg_severity_to_color(enum CLG_Severity severity)
  * \{ */
 
 /**
- * Filter the indentifier based on very basic globbing.
+ * Filter the identifier based on very basic globbing.
  * - `foo` exact match of `foo`.
  * - `foo.bar` exact match for `foo.bar`
  * - `foo.*` match for `foo` & `foo.bar` & `foo.bar.baz`
@@ -367,7 +367,7 @@ static void clg_ctx_fatal_action(CLogContext *ctx)
 
 static void clg_ctx_backtrace(CLogContext *ctx)
 {
-  /* Note: we avoid writing fo 'FILE', for backtrace we make an exception,
+  /* Note: we avoid writing to 'FILE', for back-trace we make an exception,
    * if necessary we could have a version of the callback that writes to file
    * descriptor all at once. */
   ctx->callbacks.backtrace_fn(ctx->output_file);
@@ -549,11 +549,11 @@ static void CLG_ctx_output_set(CLogContext *ctx, void *file_handle)
   ctx->use_color = isatty(ctx->output);
 #elif defined(WIN32)
   /* Windows Terminal supports color like the Linux terminals do while the standard console does
-   * not, the way to tell the two apart is to look at the WT_SESSION environment variable which
+   * not, the way to tell the two apart is to look at the `WT_SESSION` environment variable which
    * will only be defined for Windows Terminal. */
 
-  /* getenv is used here rather than BLI_getenv since there are no benefits for using it in this
-   * context. */
+  /* #getenv is used here rather than #BLI_getenv since it would be a bad level call
+   * and there are no benefits for using it in this context. */
   ctx->use_color = isatty(ctx->output) && getenv("WT_SESSION");
 #endif
 }
@@ -729,7 +729,8 @@ void CLG_level_set(int level)
 
 /* -------------------------------------------------------------------- */
 /** \name Logging Reference API
- * Use to avoid lookups each time.
+ *
+ * Use to avoid look-ups each time.
  * \{ */
 
 void CLG_logref_init(CLG_LogRef *clg_ref)
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 183ed3668b7..8dc661e6c85 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1074,7 +1074,7 @@ static void write_pose(BlendWriter *writer, bPose *pose, bArmature *arm)
     write_motionpath(writer, chan->mpath);
 
     /* Prevent crashes with autosave,
-     * when a bone duplicated in editmode has not yet been assigned to its posechannel.
+     * when a bone duplicated in edit-mode has not yet been assigned to its pose-channel.
      * Also needed with memundo, in some cases we can store a step before pose has been
      * properly rebuilt from previous undo step. */
     Bone *bone = (pose->flag & POSE_RECALC) ? BKE_armature_find_bone_name(arm, chan->name) :
@@ -1305,12 +1305,12 @@ static void write_object(BlendWriter *writer, Object *ob, const void *id_address
 {
   const bool is_undo = BLO_write_is_undo(writer);
   if (ob->id.us > 0 || is_undo) {
-    /* Clean up, important in undo case to reduce false detection of changed datablocks. */
+    /* Clean up, important in undo case to reduce false detection of changed data-blocks. */
     BKE_object_runtime_reset(ob);
 
     if (is_undo) {
-      /* For undo we stay in object mode during undo presses, so keep editmode disabled on save as
-       * well, can help reducing false detection of changed datablocks. */
+      /* For undo we stay in object mode during undo presses, so keep edit-mode disabled on save as
+       * well, can help reducing false detection of changed data-blocks. */
       ob->mode &= ~OB_MODE_EDIT;
     }
 
@@ -1392,7 +1392,7 @@ static void write_collection_nolib(BlendWriter *writer, Collection *collection)
 static void write_collection(BlendWriter *writer, Collection *collection, const void *id_address)
 {
   if (collection->id.us > 0 || BLO_write_is_undo(writer)) {
-    /* Clean up, important in undo case to reduce false detection of changed datablocks. */
+    /* Clean up, important in undo case to reduce false detection of changed data-blocks. */
     collection->flag &= ~COLLECTION_HAS_OBJECT_CACHE;
     collection->tag = 0;
     BLI_listbase_clear(&collection->object_cache);
@@ -1519,7 +1519,7 @@ static void write_lightcache(BlendWriter *writer, LightCache *cache)
 static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address)
 {
   if (BLO_write_is_undo(writer)) {
-    /* Clean up, important in undo case to reduce false detection of changed datablocks. */
+    /* Clean up, important in undo case to reduce false detection of changed data-blocks. */
     /* XXX This UI data should not be stored in Scene at all... */
     memset(&sce->cursor, 0, sizeof(sce->cursor));
   }
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index 06ab60d992c..e7a4966bd6f 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -1565,9 +1565,9 @@ static void transform_apply_to_mirror(TransInfo *t)
 
 void recalcData_mesh(TransInfo *t)
 {
-  bool is_cancelling = t->state == TRANS_CANCEL;
+  bool is_canceling = t->state == TRANS_CANCEL;
   /* mirror modifier clipping? */
-  if (!is_cancelling) {
+  if (!is_canceling) {
     /* apply clipping after so we never project past the clip plane [#25423] */
     applyProject(t);
     clipMirrorModifier(t);
@@ -1597,13 +1597,12 @@ void recalcData_mesh(TransInfo *t)
 
 void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t)
 {
-  const bool is_cancelling = (t->state == TRANS_CANCEL);
-  const bool use_automerge = !is_cancelling && (t->flag & (T_AUTOMERGE | T_AUTOSPLIT)) != 0;
+  const bool is_canceling = (t->state == TRANS_CANCEL);
+  const bool use_automerge = !is_canceling && (t->flag & (T_AUTOMERGE | T_AUTOSPLIT)) != 0;
 
-  if (!is_cancelling && ELEM(t->mode, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) {
-    /* Handle multires re-projection, done
-     * on transform completion since it's
-     * really slow -joeedh. */
+  if (!is_canceling && ELEM(t->mode, TFM_EDGE_SLIDE, TFM_VERT_SLIDE)) {
+    /* NOTE(joeedh): Handle multi-res re-projection,
+     * done on transform completion since it's really slow. */
     mesh_customdatacorrect_apply(t, true);
   }
 
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc
index 67d4311750d..797f9ff404c 100644
--- a/source/blender/gpu/opengl/gl_debug.cc
+++ b/source/blender/gpu/opengl/gl_debug.cc
@@ -73,7 +73,7 @@ static void APIENTRY debug_callback(GLenum UNUSED(source),
 {
   if (ELEM(type, GL_DEBUG_TYPE_PUSH_GROUP, GL_DEBUG_TYPE_POP_GROUP)) {
     /* The debug layer will emit a message each time a debug group is pushed or popped.
-     * We use that for easy command grouping inside frame analyser tools. */
+     * We use that for easy command grouping inside frame analyzer tools. */
     return;
   }