[Bf-blender-cvs] [8a6c689f30] master: Fix T50386: Crash when spawning pie menus
Julian Eisel
noreply at git.blender.org
Tue Jan 24 21:37:15 CET 2017
Commit: 8a6c689f30359d1b86deee6a4ed34747fe314d23
Author: Julian Eisel
Date: Tue Jan 24 21:35:38 2017 +0100
Branches: master
https://developer.blender.org/rB8a6c689f30359d1b86deee6a4ed34747fe314d23
Fix T50386: Crash when spawning pie menus
D2455 by @raa, thanks!
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index b02a909d00..7262b453e0 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;
}
More information about the Bf-blender-cvs
mailing list