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

Campbell Barton noreply at git.blender.org
Sat Jan 25 10:17:52 CET 2020


Commit: cb83cf1b71664c569f72168b759a30152a60607c
Author: Campbell Barton
Date:   Sat Jan 25 20:09:20 2020 +1100
Branches: master
https://developer.blender.org/rBcb83cf1b71664c569f72168b759a30152a60607c

Cleanup: spelling

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

M	source/blender/blenkernel/intern/library_query.c
M	source/blender/depsgraph/intern/eval/deg_eval.cc
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/space_graph/graph_edit.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blender/windowmanager/intern/wm_window.c
M	source/creator/creator_signals.c

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

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 974d6328fcb..5fd852ff089 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -340,7 +340,7 @@ static void library_foreach_layer_collection(LibraryForeachIDData *data, ListBas
   FOREACH_FINALIZE_VOID;
 }
 
-/* Used by both real Collection data-blokcs, and the fake horror of master collection from Scene.
+/* Used by both real Collection data-blocks, and the fake horror of master collection from Scene.
  */
 static void library_foreach_collection(LibraryForeachIDData *data, Collection *collection)
 {
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 9a10177a462..df61a1416bd 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -87,7 +87,7 @@ enum class EvaluationStage {
 
   /* Workaround for areas which can not be evaluated in threads.
    *
-   * For example, metaballs, which are iterating over all bases and are requesting duplilists
+   * For example, metaballs, which are iterating over all bases and are requesting dupli-lists
    * to see whether there are metaballs inside. */
   SINGLE_THREADED_WORKAROUND,
 };
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index b9c89b9944f..f9e2a2b8a1a 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1758,10 +1758,10 @@ static Collection *single_object_users_collection(Main *bmain,
         bmain, scene, child->collection, flag, copy_collections, false);
 
     if (is_master_collection && copy_collections && child->collection != collection_child_new) {
-      /* We do not want a collection sync here, our collections are in a complete unsetled state
-       * currently. With current code, that would lead to a memory leak - because of reasons.
+      /* We do not want a collection sync here, our collections are in a complete uninitialized
+       * state currently. With current code, that would lead to a memory leak - because of reasons.
        * It would be a useless loss of computing anyway, since caller has to fully refresh
-       * viewlayers/collections caching at the end. */
+       * view-layers/collections caching at the end. */
       BKE_collection_child_add_no_sync(collection, collection_child_new);
       BLI_remlink(&collection->children, child);
       MEM_freeN(child);
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 1a3f57a1ed7..314144cecfa 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3725,7 +3725,7 @@ static void do_pose_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
   float ik_target[3];
   const ePaintSymmetryFlags symm = sd->paint.symmetry_flags & PAINT_SYMM_AXIS_ALL;
 
-  /* The pose brush applies all enabled symmetry axis in a sigle iteration, so the rest can be
+  /* The pose brush applies all enabled symmetry axis in a single iteration, so the rest can be
    * ignored. */
   if (ss->cache->mirror_symmetry_pass != 0) {
     return;
@@ -3902,7 +3902,7 @@ static void sculpt_pose_grow_pose_factor(Sculpt *sd,
       if (pose_origin) {
         /* Test with pose origin. Used when growing the factors to compensate the Origin Offset. */
         /* Stop when the factor's avg_pos starts moving away from the origin instead of getting
-         * closert to it. */
+         * closer to it. */
         float len = len_v3v3(gftd.pos_avg, pose_origin);
         if (len < prev_len) {
           prev_len = len;
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 59a1102f7d6..2060288bb0e 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -292,8 +292,8 @@ static int graphkeys_viewall(bContext *C,
   /* Give some more space at the borders. */
   BLI_rctf_scale(&cur_new, 1.1f);
 
-  /* Take regions into account, that could block the view. Marker region is supposed to be larger
-   * than the scrollbar, so priorize it.*/
+  /* Take regions into account, that could block the view.
+   * Marker region is supposed to be larger than the scroll-bar, so prioritize it.*/
   float pad_top = UI_TIME_SCRUB_MARGIN_Y;
   float pad_bottom = BLI_listbase_is_empty(ED_context_get_markers(C)) ? V2D_SCROLL_HANDLE_HEIGHT :
                                                                         UI_MARKER_MARGIN_Y;
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 182e80900bd..04d56921ca6 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1574,9 +1574,9 @@ bool rna_Object_modifiers_override_apply(Main *bmain,
   ModifierData *mod_dst = ED_object_modifier_add(
       NULL, bmain, NULL, ob_dst, mod_src->name, mod_src->type);
 
-  /* XXX Current handling of 'copy' from particlesystem modifier is *very* bad (it keeps same psys
+  /* XXX Current handling of 'copy' from particle-system modifier is *very* bad (it keeps same psys
    * pointer as source, then calling code copies psys of object separately and do some magic
-   * remapping of pointers...), unfortunately several pieces of code in Obejct editing area rely on
+   * remapping of pointers...), unfortunately several pieces of code in Object editing area rely on
    * this behavior. So for now, hacking around it to get it doing what we want it to do, as getting
    * a proper behavior would be everything but trivial, and this whole particle thingy is
    * end-of-life. */
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 850eb12b12a..316cbbdbef3 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1547,7 +1547,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr
       case GHOST_kEventButtonUp: {
         if (win->active == 0) {
           /* Entering window, update cursor and tablet state.
-           * (ghost sends win-activate *after* the mouseclick in window!) */
+           * (ghost sends win-activate *after* the mouse-click in window!) */
           wm_window_update_eventstate(win);
         }
 
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
index 446f8f51875..afec54a636c 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
@@ -103,7 +103,7 @@ static void sig_handle_crash_backtrace(FILE *fp)
 static void sig_handle_crash(int signum)
 {
   /* Might be called after WM/Main exit, so needs to be careful about NULL-checking before
-   * dereferencing. */
+   * de-referencing. */
 
   wmWindowManager *wm = G_MAIN ? G_MAIN->wm.first : NULL;



More information about the Bf-blender-cvs mailing list