[Bf-blender-cvs] [d975e195833] master: Cleanup: correct spelling in code

Campbell Barton noreply at git.blender.org
Fri Feb 5 06:31:39 CET 2021


Commit: d975e19583311f52ddabdb2c7066971ea2da14ac
Author: Campbell Barton
Date:   Fri Feb 5 16:30:49 2021 +1100
Branches: master
https://developer.blender.org/rBd975e19583311f52ddabdb2c7066971ea2da14ac

Cleanup: correct spelling in code

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

M	source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
M	source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
M	source/blender/editors/interface/interface_panel.c
M	source/blender/io/common/intern/object_identifier_test.cc

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

diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index fbbd373ba09..b548a684ba5 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -1256,7 +1256,7 @@ void DoubleEdgeMaskOperation::doDoubleEdgeMask(float *imask, float *omask, float
      *
      * Each version has slightly different criteria for detecting an edge pixel.
      */
-    if (this->m_adjecentOnly) {  // if "adjacent only" inner edge mode is turned on
+    if (this->m_adjacentOnly) {  // if "adjacent only" inner edge mode is turned on
       if (this->m_keepInside) {  // if "keep inside" buffer edge mode is turned on
         do_adjacentKeepBorders(t, rw, limask, lomask, lres, res, rsize);
       }
@@ -1313,7 +1313,7 @@ DoubleEdgeMaskOperation::DoubleEdgeMaskOperation()
   this->addOutputSocket(COM_DT_VALUE);
   this->m_inputInnerMask = nullptr;
   this->m_inputOuterMask = nullptr;
-  this->m_adjecentOnly = false;
+  this->m_adjacentOnly = false;
   this->m_keepInside = false;
   this->setComplex(true);
 }
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
index e53aa7eb8aa..813f5009815 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
@@ -27,7 +27,7 @@ class DoubleEdgeMaskOperation : public NodeOperation {
    */
   SocketReader *m_inputOuterMask;
   SocketReader *m_inputInnerMask;
-  bool m_adjecentOnly;
+  bool m_adjacentOnly;
   bool m_keepInside;
   float *m_cachedInstance;
 
@@ -56,9 +56,9 @@ class DoubleEdgeMaskOperation : public NodeOperation {
                                         ReadBufferOperation *readOperation,
                                         rcti *output);
 
-  void setAdjecentOnly(bool adjecentOnly)
+  void setAdjecentOnly(bool adjacentOnly)
   {
-    this->m_adjecentOnly = adjecentOnly;
+    this->m_adjacentOnly = adjacentOnly;
   }
   void setKeepInside(bool keepInside)
   {
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 9a13918bb69..7343417137a 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -926,9 +926,9 @@ bool UI_panel_matches_search_filter(const Panel *panel)
 /**
  * Set the flag telling the panel to use its search result status for its expansion.
  */
-static void panel_set_expansion_from_seach_filter_recursive(const bContext *C,
-                                                            Panel *panel,
-                                                            const bool use_search_closed)
+static void panel_set_expansion_from_search_filter_recursive(const bContext *C,
+                                                             Panel *panel,
+                                                             const bool use_search_closed)
 {
   /* This has to run on inactive panels that may not have a type,
    * but we can prevent running on header-less panels in some cases. */
@@ -939,21 +939,21 @@ static void panel_set_expansion_from_seach_filter_recursive(const bContext *C,
   LISTBASE_FOREACH (Panel *, child_panel, &panel->children) {
     /* Don't check if the sub-panel is active, otherwise the
      * expansion won't be reset when the parent is closed. */
-    panel_set_expansion_from_seach_filter_recursive(C, child_panel, use_search_closed);
+    panel_set_expansion_from_search_filter_recursive(C, child_panel, use_search_closed);
   }
 }
 
 /**
  * Set the flag telling every panel to override its expansion with its search result status.
  */
-static void region_panels_set_expansion_from_seach_filter(const bContext *C,
-                                                          ARegion *region,
-                                                          const bool use_search_closed)
+static void region_panels_set_expansion_from_search_filter(const bContext *C,
+                                                           ARegion *region,
+                                                           const bool use_search_closed)
 {
   LISTBASE_FOREACH (Panel *, panel, &region->panels) {
     /* Don't check if the panel is active, otherwise the expansion won't
      * be correct when switching back to tab after exiting search. */
-    panel_set_expansion_from_seach_filter_recursive(C, panel, use_search_closed);
+    panel_set_expansion_from_search_filter_recursive(C, panel, use_search_closed);
   }
   set_panels_list_data_expand_flag(C, region);
 }
@@ -1923,10 +1923,10 @@ void UI_panels_end(const bContext *C, ARegion *region, int *r_x, int *r_y)
   const bool region_search_filter_active = region->flag & RGN_FLAG_SEARCH_FILTER_ACTIVE;
 
   if (properties_space_needs_realign(area, region)) {
-    region_panels_set_expansion_from_seach_filter(C, region, region_search_filter_active);
+    region_panels_set_expansion_from_search_filter(C, region, region_search_filter_active);
   }
   else if (region->flag & RGN_FLAG_SEARCH_FILTER_UPDATE) {
-    region_panels_set_expansion_from_seach_filter(C, region, region_search_filter_active);
+    region_panels_set_expansion_from_search_filter(C, region, region_search_filter_active);
   }
 
   if (region->flag & RGN_FLAG_SEARCH_FILTER_ACTIVE) {
diff --git a/source/blender/io/common/intern/object_identifier_test.cc b/source/blender/io/common/intern/object_identifier_test.cc
index 30e1e43d076..8d0800ce2cb 100644
--- a/source/blender/io/common/intern/object_identifier_test.cc
+++ b/source/blender/io/common/intern/object_identifier_test.cc
@@ -129,7 +129,7 @@ TEST_F(ObjectIdentifierOrderTest, duplicated_objects)
   EXPECT_FALSE(id_different_dupli_b < id_dupli_b);
 }
 
-TEST_F(ObjectIdentifierOrderTest, behaviour_as_map_keys)
+TEST_F(ObjectIdentifierOrderTest, behavior_as_map_keys)
 {
   ObjectIdentifier id_root = ObjectIdentifier::for_graph_root();
   ObjectIdentifier id_another_root = ObjectIdentifier::for_graph_root();



More information about the Bf-blender-cvs mailing list