diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-22 20:59:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-22 20:59:40 +0300 |
| commit | 8b4e0eb88e715392490aefa520d2c5444f084a44 (patch) | |
| tree | 8723313c314426b3770a376930560dc1e785836d /source/blender/windowmanager | |
| parent | 9c5c91cc7cc8fc1cc3b2ce9e6973a46fb1ccb244 (diff) | |
Fix T59962, T60130: error adding image sequence with node wrangler.
The region should be restored correctly, there is already a similar test for
areas to be preserved.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index a6e492e7449..70c2470e764 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3365,7 +3365,8 @@ void WM_event_modal_handler_region_replace(wmWindow *win, const ARegion *old_reg LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) { if (handler_base->type == WM_HANDLER_TYPE_OP) { wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base; - if (handler->context.region == old_region) { + /* fileselect handler is quite special... it needs to keep old region stored in handler, so don't change it */ + if ((handler->context.region == old_region) && (handler->is_fileselect == false)) { handler->context.region = new_region; handler->context.region_type = new_region ? new_region->regiontype : RGN_TYPE_WINDOW; } |