archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: correct spelling in code

Browse Source
This commit is contained in:
Campbell Barton
2021-02-05 16:30:49 +11:00
parent 17e1e2bfd8
commit d975e19583
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
View File

@@ -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);
}

6
source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
View File

@@ -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)
{

20
source/blender/editors/interface/interface_panel.c
View File

@@ -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) {

2
source/blender/io/common/intern/object_identifier_test.cc
View File

@@ -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();