blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b5f822d3c - Show all commits

6
source/blender/editors/interface/interface_handlers.cc
View File

@ -10166,7 +10166,11 @@ static bool ui_menu_pass_event_to_parent_if_nonactive(uiPopupBlockHandle *menu,
const int level,
const int retval)
{
if ((level != 0) && (but == nullptr)) {
/* NOTE(@ideasman42): For `menu->popup` (not a nested tree of menus), don't pass events parents.
* This is needed because enum popups (for example) aren't created with an active button.
* Otherwise opening a popup & pressing the accelerator key would fail, see: #107838. */
if ((level != 0) && (but == nullptr) && (menu->popup == false)) {
menu->menuretval = UI_RETURN_OUT | UI_RETURN_OUT_PARENT;
(void)retval; /* so release builds with strict flags are happy as well */
BLI_assert(retval == WM_UI_HANDLER_CONTINUE);