Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-12-28 12:07:36 +0300
committerBastien Montagne <bastien@blender.org>2020-12-28 12:22:02 +0300
commite6bb2cdec75229b21e82c88263d68eadf4ffe95a (patch)
tree7ae90b76ccf99e35d4551cc871da4b9beccb1920 /source/blender/editors
parente0b6c8f77743d1fa489bc574cbfe1ef4f3415342 (diff)
Cleanup: Typo: `overriden` -> `overridden`.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/include/UI_interface.h2
-rw-r--r--source/blender/editors/interface/interface.c6
-rw-r--r--source/blender/editors/interface/interface_anim.c2
-rw-r--r--source/blender/editors/interface/interface_context_menu.c2
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 2705dd27756..05c3d6eff70 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -229,7 +229,7 @@ enum {
UI_BUT_VALUE_CLEAR = 1 << 30,
/** RNA property of the button is overridden from linked reference data. */
- UI_BUT_OVERRIDEN = 1u << 31u,
+ UI_BUT_OVERRIDDEN = 1u << 31u,
};
/* Default font size for normal text. */
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index d47d9c5e874..f514588e132 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1592,10 +1592,10 @@ void ui_but_override_flag(Main *bmain, uiBut *but)
bmain, &but->rnapoin, but->rnaprop, but->rnaindex);
if (override_status & RNA_OVERRIDE_STATUS_OVERRIDDEN) {
- but->flag |= UI_BUT_OVERRIDEN;
+ but->flag |= UI_BUT_OVERRIDDEN;
}
else {
- but->flag &= ~UI_BUT_OVERRIDEN;
+ but->flag &= ~UI_BUT_OVERRIDDEN;
}
}
@@ -4537,7 +4537,7 @@ static uiBut *ui_def_but_rna(uiBlock *block,
block, type, retval, str, x, y, width, height, NULL, min, max, a1, a2, tip);
if (but->type == UI_BTYPE_NUM) {
- /* Set default values, can be overriden later. */
+ /* Set default values, can be overridden later. */
UI_but_number_step_size_set(but, a1);
UI_but_number_precision_set(but, a2);
}
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 6fb9b99632e..3101b3222c4 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -169,7 +169,7 @@ void ui_but_anim_decorate_update_from_flag(uiButDecorator *decorator_but)
else if (flag & UI_BUT_ANIMATED) {
but->icon = ICON_DECORATE_ANIMATE;
}
- else if (flag & UI_BUT_OVERRIDEN) {
+ else if (flag & UI_BUT_OVERRIDDEN) {
but->icon = ICON_DECORATE_OVERRIDE;
}
else {
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c
index fd3b00eec31..54ebb3d5746 100644
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@ -784,7 +784,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
/* Override Operators */
uiItemS(layout);
- if (but->flag & UI_BUT_OVERRIDEN) {
+ if (but->flag & UI_BUT_OVERRIDDEN) {
if (is_array_component) {
#if 0 /* Disabled for now. */
ot = WM_operatortype_find("UI_OT_override_type_set_button", false);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 77de9a8976e..9950f242be8 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2540,7 +2540,7 @@ static const uchar *widget_color_blend_from_flags(const uiWidgetStateColors *wco
if (state & UI_BUT_DRIVEN) {
return wcol_state->inner_driven_sel;
}
- if (state & UI_BUT_OVERRIDEN) {
+ if (state & UI_BUT_OVERRIDDEN) {
return wcol_state->inner_overridden_sel;
}
return NULL;
@@ -3824,7 +3824,7 @@ static void widget_swatch(
ui_but_v3_get(but, col);
- if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN |
+ if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDDEN |
UI_BUT_REDALERT)) ||
(but->drawflag & UI_BUT_ANIMATED_CHANGED)) {
/* draw based on state - color for keyed etc */