[Bf-blender-cvs] [25d8ce16b53] master: Cleanup: spelling in comments

Campbell Barton noreply at git.blender.org
Wed Jun 9 18:23:49 CEST 2021


Commit: 25d8ce16b53d64a9921243e9b4f816f97659b4be
Author: Campbell Barton
Date:   Thu Jun 10 01:55:42 2021 +1000
Branches: master
https://developer.blender.org/rB25d8ce16b53d64a9921243e9b4f816f97659b4be

Cleanup: spelling in comments

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

M	source/blender/blenkernel/intern/collection.c
M	source/blender/blenlib/BLI_task.h
M	source/blender/draw/engines/image/image_engine.c
M	source/blender/editors/space_graph/graph_select.c
M	source/blender/editors/space_node/node_group.cc

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 7b1aaf04640..aa51ee0017e 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1644,7 +1644,7 @@ void BKE_collection_parent_relations_rebuild(Collection *collection)
     }
 
     /* Can happen when remapping data partially out-of-Main (during advanced ID management
-     * operations like liboverride resync e.g.). */
+     * operations like lib-override resync e.g.). */
     if ((child->collection->id.tag & (LIB_TAG_NO_MAIN | LIB_TAG_COPIED_ON_WRITE)) != 0) {
       continue;
     }
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h
index 59020c9eb1e..83ccfda7e38 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -70,20 +70,20 @@ typedef enum TaskPriority {
 /**
  * Task isolation helps avoid unexpected task scheduling decisions that can lead to bugs if wrong
  * assumptions were made. Typically that happens when doing "nested threading", i.e. one thread
- * schedules a bunch of main-tasks and those spawn new subtasks.
+ * schedules a bunch of main-tasks and those spawn new sub-tasks.
  *
- * What can happen is that when a main-task waits for its subtasks to complete on other threads,
+ * What can happen is that when a main-task waits for its sub-tasks to complete on other threads,
  * another main-task is scheduled within the already running main-task. Generally, this is good,
  * because it leads to better performance. However, sometimes code (often unintentionally) makes
  * the assumption that at most one main-task runs on a thread at a time.
  *
  * The bugs often show themselves in two ways:
- * - Deadlock, when a main-task holds a mutex while waiting for its subtasks to complete.
- * - Data corruption, when a main-task makes wrong assumptions about a threadlocal variable.
+ * - Deadlock, when a main-task holds a mutex while waiting for its sub-tasks to complete.
+ * - Data corruption, when a main-task makes wrong assumptions about a thread-local variable.
  *
  * Task isolation can avoid these bugs by making sure that a main-task does not start executing
- * another main-task while waiting for its subtasks. More precisely, a function that runs in an
- * isolated region is only allowed to run subtasks that were spawned in the same isolated region.
+ * another main-task while waiting for its sub-tasks. More precisely, a function that runs in an
+ * isolated region is only allowed to run sub-tasks that were spawned in the same isolated region.
  *
  * Unfortunately, incorrect use of task isolation can lead to deadlocks itself. This can happen
  * when threading primitives are used that separate spawning tasks from executing them. The problem
diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c
index d75f887ce2b..2522a445d8e 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -107,7 +107,7 @@ static void space_image_gpu_texture_get(Image *image,
   const DRWContextState *draw_ctx = DRW_context_state_get();
   SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
   if (BKE_image_is_multilayer(image)) {
-    /* update multiindex and pass for the current eye */
+    /* Update multi-index and pass for the current eye. */
     BKE_image_multilayer_index(image->rr, &sima->iuser);
   }
   BKE_image_multiview_index(image, &sima->iuser);
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index b9c235873a7..0e22a2fffe1 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -718,7 +718,7 @@ static bool rectf_curve_intersection(
  * to select a curve by sampling it at various points instead of trying to select the
  * keyframes directly.
  * The selection actions done to a curve are actually done on all the keyframes of the curve.
- * Note: This function is only called if no keyframe is in the seletion area.
+ * Note: This function is only called if no keyframe is in the selection area.
  */
 static void box_select_graphcurves(bAnimContext *ac,
                                    const rctf *rectf_view,
@@ -739,7 +739,7 @@ static void box_select_graphcurves(bAnimContext *ac,
   FCurve *last_selected_curve = NULL;
 
   /* Go through all the curves and try selecting them. This function is only called
-   * if no keyframe is in the seletion area, so we only have to check if the curve
+   * if no keyframe is in the selection area, so we only have to check if the curve
    * intersects the area in order to check if the selection/deselection must happen.
    */
 
diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc
index 34450016698..851d386ad0d 100644
--- a/source/blender/editors/space_node/node_group.cc
+++ b/source/blender/editors/space_node/node_group.cc
@@ -70,9 +70,8 @@ static bool node_group_operator_active_poll(bContext *C)
     SpaceNode *snode = CTX_wm_space_node(C);
 
     /* Group operators only defined for standard node tree types.
-     * Disabled otherwise to allow pynodes define their own operators
-     * with same keymap.
-     */
+     * Disabled otherwise to allow python-nodes define their own operators
+     * with same key-map. */
     if (STR_ELEM(snode->tree_idname,
                  "ShaderNodeTree",
                  "CompositorNodeTree",
@@ -90,9 +89,8 @@ static bool node_group_operator_editable(bContext *C)
     SpaceNode *snode = CTX_wm_space_node(C);
 
     /* Group operators only defined for standard node tree types.
-     * Disabled otherwise to allow pynodes define their own operators
-     * with same keymap.
-     */
+     * Disabled otherwise to allow python-nodes define their own operators
+     * with same key-map. */
     if (ED_node_is_shader(snode) || ED_node_is_compositor(snode) || ED_node_is_texture(snode) ||
         ED_node_is_geometry(snode)) {
       return true;



More information about the Bf-blender-cvs mailing list