diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-01-24 23:35:38 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-01-24 23:35:38 +0300 |
| commit | 8a6c689f30359d1b86deee6a4ed34747fe314d23 (patch) | |
| tree | 5cfc36256450c5dc96aac2b25559ecbbd85f15cc /source/blender/editors/interface | |
| parent | 605695de611823e9ce086d224613858ec584b605 (diff) | |
Fix T50386: Crash when spawning pie menus
D2455 by @raa, thanks!
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index b02a909d009..7262b453e02 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -581,6 +581,9 @@ static void ui_item_enum_expand( UI_block_layout_set_current(block, layout_radial); } else { + if (layout->item.type == ITEM_LAYOUT_RADIAL) { + layout_radial = layout; + } UI_block_layout_set_current(block, layout); } } @@ -593,8 +596,9 @@ static void ui_item_enum_expand( for (item = item_array; item->identifier; item++) { if (!item->identifier[0]) { - if (radial) + if (radial && layout_radial) { uiItemS(layout_radial); + } continue; } |