Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-06-07 16:53:31 +02:00
commit 8dc33a81b0
Notes: blender-bot 2023-09-08 04:55:43 +02:00
Referenced by issue #55375, Crash when changing visibility of instanced collection
Referenced by issue #55376, Instanced collection render visibility ignored
1 changed files with 6 additions and 3 deletions

View File

@ -3910,9 +3910,12 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
/* double click test - only for press */
if (event.val == KM_PRESS) {
evt->prevclicktime = PIL_check_seconds_timer();
evt->prevclickx = event.x;
evt->prevclicky = event.y;
/* Don't reset timer & location when holding the key generates repeat events. */
if ((evt->prevtype != event.type) || (evt->prevval != KM_PRESS)) {
evt->prevclicktime = PIL_check_seconds_timer();
evt->prevclickx = event.x;
evt->prevclicky = event.y;
}
}
wm_event_add(win, &event);