Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +10
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ebad816057 - Show all commits

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

@ -7942,6 +7942,16 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
return WM_UI_HANDLER_CONTINUE; return WM_UI_HANDLER_CONTINUE;
} }
#ifdef WITH_INPUT_NDOF
/* 2D view navigation conflicts with using NDOF to adjust colors,
* especially in the node-editor, see: #105224. */
if (event->type == NDOF_MOTION) {
if (data->region->type->keymapflag & ED_KEYMAP_VIEW2D) {
return WM_UI_HANDLER_CONTINUE;
}
}
#endif /* WITH_INPUT_NDOF */
if (do_paste) { if (do_paste) {
ui_but_paste(C, but, data, event->modifier & KM_ALT); ui_but_paste(C, but, data, event->modifier & KM_ALT);
return WM_UI_HANDLER_BREAK; return WM_UI_HANDLER_BREAK;