[Bf-blender-cvs] [7e8cba98b6f] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Wed Sep 16 07:47:07 CEST 2020
Commit: 7e8cba98b6f0f2372706901eae3ee19f3bc5c779
Author: Campbell Barton
Date: Wed Sep 16 15:28:02 2020 +1000
Branches: master
https://developer.blender.org/rB7e8cba98b6f0f2372706901eae3ee19f3bc5c779
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/fcurve.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/space_buttons/buttons_ops.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/gpu/intern/gpu_debug.cc
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index c1233a5ea61..8da6178f82c 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1338,8 +1338,7 @@ void correct_bezpart(const float v1[2], float v2[2], float v3[2], const float v4
}
/* To prevent looping or rewinding, handles cannot
- * exceed the adjacent's keyframe time position.
- */
+ * exceed the adjacent key-frames time position. */
if (len1 > len) {
fac = len / len1;
v2[0] = (v1[0] - fac * h1[0]);
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index ab3b1525e9e..8f7d1eec8d9 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -2089,7 +2089,7 @@ static void annotation_draw_apply_event(
}
else {
p->straight[0] = 0;
- /* We were using shift while having permanent stabilization actived,
+ /* We were using shift while having permanent stabilization active,
so activate the temp flag back again. */
if (p->flags & GP_PAINTFLAG_USE_STABILIZER) {
if ((p->flags & GP_PAINTFLAG_USE_STABILIZER_TEMP) == 0) {
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 6a0b643fb84..7628d8a37c6 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -155,10 +155,10 @@ enum {
UI_BLOCK_RADIAL = 1 << 20,
UI_BLOCK_POPOVER = 1 << 21,
UI_BLOCK_POPOVER_ONCE = 1 << 22,
- /** Always show keymaps, even for non-menus. */
+ /** Always show key-maps, even for non-menus. */
UI_BLOCK_SHOW_SHORTCUT_ALWAYS = 1 << 23,
/** The block is only used during the search process and will not be drawn.
- * Currently just for the case of a closed panel's subpanel (and its subpanels). */
+ * Currently just for the case of a closed panel's sub-panel (and its sub-panels). */
UI_BLOCK_SEARCH_ONLY = 1 << 25,
};
@@ -320,7 +320,7 @@ typedef enum {
UI_BTYPE_BUT = 1 << 9,
UI_BTYPE_ROW = 2 << 9,
UI_BTYPE_TEXT = 3 << 9,
- /** dropdown list */
+ /** Drop-down list. */
UI_BTYPE_MENU = 4 << 9,
UI_BTYPE_BUT_MENU = 5 << 9,
/** number button */
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 5d20846c528..11c7f68ae55 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -392,7 +392,7 @@ static void ui_block_bounds_calc_text(uiBlock *block, float offset)
}
/* Skip all buttons that are in a horizontal alignment group.
- * We don't want to split them appart (but still check the row's width and apply current
+ * We don't want to split them apart (but still check the row's width and apply current
* offsets). */
if (bt->next && ui_but_is_row_alignment_group(bt, bt->next)) {
int width = 0;
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 6a6914daf47..c7f941c9c9a 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2053,8 +2053,8 @@ static void ui_apply_but(
/* postpone clearing origdata */
}
else {
- /* we avoid applying interactive edits a second time
- * at the end with the appliedinteractive flag */
+ /* We avoid applying interactive edits a second time
+ * at the end with the #uiHandleButtonData.applied_interactive flag. */
if (interactive) {
data->applied_interactive = true;
}
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index edb952c5648..7afa00d3d54 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3001,7 +3001,7 @@ static uiBut *ui_item_menu(uiLayout *layout,
}
if (ELEM(layout->root->type, UI_LAYOUT_PANEL, UI_LAYOUT_TOOLBAR) ||
- /* We never want a dropdown in menu! */
+ /* We never want a drop-down in menu! */
(force_menu && layout->root->type != UI_LAYOUT_MENU)) {
UI_but_type_set_menu_from_pulldown(but);
}
@@ -5172,7 +5172,7 @@ static bool block_search_panel_label_matches(const uiBlock *block)
}
/**
- * Buttons for search only layouts (closed panel subpanels) have still been added from the
+ * Buttons for search only layouts (closed panel sub-panels) have still been added from the
* layout functions, but they need to be hidden. Theoretically they could be removed too.
*/
static void layout_free_and_hide_buttons(uiLayout *layout)
@@ -5236,7 +5236,7 @@ static bool button_matches_search_filter(uiBut *but, const char *search_filter)
}
#endif
- /* Search through labels of enum property items if they are in a dropdown menu.
+ /* Search through labels of enum property items if they are in a drop-down menu.
* Unfortunately we have no #bContext here so we cannot search through RNA enums
* with dynamic entries (or "itemf" functions) which require context. */
if (but->type == UI_BTYPE_MENU) {
@@ -5785,7 +5785,7 @@ void UI_block_layout_resolve(uiBlock *block, int *r_x, int *r_y)
block->curlayout = NULL;
LISTBASE_FOREACH_MUTABLE (uiLayoutRoot *, root, &block->layouts) {
- /* Seach only roots should be removed by #UI_block_apply_search_filter. */
+ /* Search only roots should be removed by #UI_block_apply_search_filter. */
BLI_assert(!root->search_only);
ui_layout_add_padding_button(root);
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 101d3a7d38d..aee2529134c 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -835,7 +835,7 @@ static void panel_matches_search_filter_recursive(const Panel *panel, bool *filt
}
/**
- * Find whether a panel or any of its subpanels contain a property that matches the search filter,
+ * Find whether a panel or any of its sub-panels contain a property that matches the search filter,
* depending on the search process running in #UI_block_apply_search_filter earlier.
*/
bool UI_panel_matches_search_filter(const Panel *panel)
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c
index f21bedfb366..7fd48108158 100644
--- a/source/blender/editors/space_buttons/buttons_ops.c
+++ b/source/blender/editors/space_buttons/buttons_ops.c
@@ -54,7 +54,7 @@
#include "buttons_intern.h" /* own include */
/* -------------------------------------------------------------------- */
-/** \name Start / Clear Seach Filter Operators
+/** \name Start / Clear Search Filter Operators
*
* \note Almost a duplicate of the file browser operator #FILE_OT_start_filter.
* \{ */
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index 8e5aa00115b..dc35a0f3658 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -464,8 +464,8 @@ static void template_texture_user_menu(bContext *C, uiLayout *layout, void *UNUS
void uiTemplateTextureUser(uiLayout *layout, bContext *C)
{
- /* texture user selection dropdown menu. the available users have been
- * gathered before drawing in ButsContextTexture, we merely need to
+ /* Texture user selection drop-down menu. the available users have been
+ * gathered before drawing in #ButsContextTexture, we merely need to
* display the current item. */
SpaceProperties *sbuts = CTX_wm_space_properties(C);
ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL;
diff --git a/source/blender/gpu/intern/gpu_debug.cc b/source/blender/gpu/intern/gpu_debug.cc
index a0608f52c4a..3d17b6f8649 100644
--- a/source/blender/gpu/intern/gpu_debug.cc
+++ b/source/blender/gpu/intern/gpu_debug.cc
@@ -55,8 +55,10 @@ void GPU_debug_group_end(void)
ctx->debug_group_end();
}
-/* Return a formated string showing the current group hierarchy in this format:
- * "Group1 > Group 2 > Group3 > ... > GroupN : " */
+/**
+ * Return a formatted string showing the current group hierarchy in this format:
+ * "Group1 > Group 2 > Group3 > ... > GroupN : "
+ */
void GPU_debug_get_groups_names(int name_buf_len, char *r_name_buf)
{
Context *ctx = Context::get();
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 3237f33835e..8c99a4cc1a1 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3244,7 +3244,7 @@ static const EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl)
while (rl) {
tmp.identifier = rl->name;
/* Little trick: using space char instead empty string
- * makes the item selectable in the dropdown. */
+ * makes the item selectable in the drop-down. */
if (rl->name[0] == '\0') {
tmp.name = " ";
}
@@ -3320,7 +3320,7 @@ static const EnumPropertyItem *renderresult_views_add_enum(RenderView *rv)
while (rv) {
tmp.identifier = rv->name;
/* Little trick: using space char instead empty string
- * makes the item selectable in the dropdown. */
+ * makes the item selectable in the drop-down. */
if (rv->name[0] == '\0') {
tmp.name = " ";
}
More information about the Bf-blender-cvs
mailing list