blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: Typo: `overriden` -> `overridden`.

This commit is contained in:
Bastien Montagne 2020-12-28 10:07:36 +01:00
parent e0b6c8f777
commit e6bb2cdec7
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/lib_override.c
View File

@ -986,7 +986,7 @@ IDOverrideLibraryProperty *BKE_lib_override_library_property_get(IDOverrideLibra
/**
* Get the RNA-property matching the \a library_prop override property. Used for UI to query
* additional data about the overriden property (e.g. UI name).
* additional data about the overridden property (e.g. UI name).
*
* \param idpoin: Pointer to the override ID.
* \param library_prop: The library override property to find the matching RNA property for.

2
source/blender/editors/include/UI_interface.h
View File

@ -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. */

6
source/blender/editors/interface/interface.c
View File

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

2
source/blender/editors/interface/interface_anim.c
View File

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

2
source/blender/editors/interface/interface_context_menu.c
View File

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

4
source/blender/editors/interface/interface_widgets.c
View File

@ -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 */

2
source/blender/makesrna/intern/rna_space.c
View File

@ -3447,7 +3447,7 @@ static void rna_def_space_outliner(BlenderRNA *brna)
RNA_def_property_boolean_negative_sdna(prop, NULL, "filter", SO_FILTER_NO_LIB_OVERRIDE);
RNA_def_property_ui_text(prop,
"Show Library Overrides",
"For libraries with overrides created, show the overriden values");
"For libraries with overrides created, show the overridden values");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL);
}