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

Cleanup: typo in variable name

Browse Source
This commit is contained in:
Campbell Barton
2019-03-23 00:01:00 +11:00
parent 2d60618746
commit caa357dae7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_layout.c
View File

@@ -1577,7 +1577,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
*
* Keep using 'use_prop_sep' instead of disabling it entirely because
* we need the ability to have decorators still. */
bool use_prop_set_split_label = use_prop_sep;
bool use_prop_sep_split_label = use_prop_sep;
#ifdef UI_PROP_DECORATE
struct {
@@ -1612,7 +1612,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
#ifdef UI_PROP_SEP_ICON_WIDTH_EXCEPTION
if (use_prop_sep) {
if (type == PROP_BOOLEAN && (icon == ICON_NONE) && !icon_only) {
use_prop_set_split_label = false;
use_prop_sep_split_label = false;
}
}
#endif
@@ -1706,7 +1706,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
}
#endif /* UI_PROP_DECORATE */
if ((name[0] == '\0') || (use_prop_set_split_label == false)) {
if ((name[0] == '\0') || (use_prop_sep_split_label == false)) {
/* Ensure we get a column when text is not set. */
layout = uiLayoutColumn(layout_row ? layout_row : layout, true);
layout->space = 0;
@@ -1797,7 +1797,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
if (index == RNA_NO_INDEX && is_array) {
ui_item_array(
layout, block, name, icon, ptr, prop, len, 0, 0, w, h,
expand, slider, toggle, icon_only, compact, !use_prop_set_split_label);
expand, slider, toggle, icon_only, compact, !use_prop_sep_split_label);
}
/* enum item */
else if (type == PROP_ENUM && index == RNA_ENUM_VALUE) {
@@ -1839,7 +1839,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
if (layout->activate_init)
UI_but_flag_enable(but, UI_BUT_ACTIVATE_ON_INIT);
if (use_prop_set_split_label == false) {
if (use_prop_sep_split_label == false) {
/* When the button uses it's own text right align it. */
but->drawflag |= UI_BUT_TEXT_RIGHT;
but->drawflag &= ~UI_BUT_TEXT_LEFT;