blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix T55517: Property-split fails w/ expanded enum

This commit is contained in:
Campbell Barton 2018-06-18 07:52:17 +02:00
parent 05b99b763e
commit a794da5200
Notes: blender-bot 2023-02-14 10:54:29 +01:00 
Referenced by issue #55517, ASSERT: layout.use_property_split=True not working with expand=True
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1488,6 +1488,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
#ifdef UI_PROP_DECORATE
struct {
bool use_prop_decorate;
int len;
uiLayout *layout;
uiBut *but;
} ui_decorate = {
@ -1583,6 +1584,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
if (ui_decorate.use_prop_decorate) {
layout_row = uiLayoutRow(layout, true);
layout_row->space = 0;
ui_decorate.len = 1;
}
#endif /* UI_PROP_DECORATE */
@ -1621,6 +1623,10 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
but->drawflag |= UI_BUT_TEXT_RIGHT;
but->drawflag &= ~UI_BUT_TEXT_LEFT;
}
#ifdef UI_PROP_DECORATE
ui_decorate.len = len;
#endif
}
else {
if (name) {
@ -1635,7 +1641,12 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
/* Watch out! We can only write into the new column now. */
layout = uiLayoutColumn(layout_split, true);
layout->space = 0;
name = "";
if ((type == PROP_ENUM) && (flag & UI_ITEM_R_EXPAND)) {
/* pass (expanded enums each have their own name) */
}
else {
name = "";
}
}
#ifdef UI_PROP_DECORATE
@ -1702,7 +1713,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
layout_col->space = 0;
layout_col->emboss = UI_EMBOSS_NONE;
int i;
for (i = 0; but_decorate; i++) {
for (i = 0; i < ui_decorate.len && but_decorate; i++) {
/* The icons are set in 'ui_but_anim_flag' */
if (is_anim) {
but = uiDefIconBut(
@ -1724,7 +1735,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
BLI_insertlinkafter(&block->buttons, but_decorate, but);
but_decorate = but->next;
}
BLI_assert(len ? (ELEM(i, 1, len)) : i == 1);
BLI_assert(ELEM(i, 1, ui_decorate.len));
}
#endif /* UI_PROP_DECORATE */