From ff8c32fa6b57d130bcc118c39523d566919fe6da Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Mar 2019 07:34:06 +1100 Subject: Fix uninitialized variable use for right aligned checkbox --- source/blender/editors/interface/interface_layout.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 98e25e1b90f..b02b32766b9 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1611,14 +1611,6 @@ 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_sep_split_label = false; - } - } -#endif - if (icon == ICON_NONE) icon = RNA_property_ui_icon(prop); @@ -1646,6 +1638,14 @@ 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_sep_split_label = false; + } + } +#endif + /* menus and pie-menus don't show checkbox without this */ if ((layout->root->type == UI_LAYOUT_MENU) || /* use checkboxes only as a fallback in pie-menu's, when no icon is defined */ -- cgit v1.2.3