Merge branch 'blender-v3.0-release'

This commit is contained in:
Campbell Barton 2021-10-28 17:49:15 +11:00
commit 5568599015
1 changed files with 6 additions and 6 deletions

View File

@ -4009,12 +4009,12 @@ wmEventHandler_Keymap *WM_event_add_keymap_handler(ListBase *handlers, wmKeyMap
*
* Follow #wmEventHandler_KeymapDynamicFn signature.
*/
void wm_event_get_keymap_from_toolsystem_ex(wmWindowManager *wm,
wmWindow *win,
wmEventHandler_Keymap *handler,
wmEventHandler_KeymapResult *km_result,
/* Extra arguments. */
const bool with_gizmos)
static void wm_event_get_keymap_from_toolsystem_ex(wmWindowManager *wm,
wmWindow *win,
wmEventHandler_Keymap *handler,
wmEventHandler_KeymapResult *km_result,
/* Extra arguments. */
const bool with_gizmos)
{
memset(km_result, 0x0, sizeof(*km_result));