[Bf-blender-cvs] [8b4e0eb88e7] master: Fix T59962, T60130: error adding image sequence with node wrangler.
Brecht Van Lommel
noreply at git.blender.org
Fri Mar 22 19:01:20 CET 2019
Commit: 8b4e0eb88e715392490aefa520d2c5444f084a44
Author: Brecht Van Lommel
Date: Fri Mar 22 18:59:40 2019 +0100
Branches: master
https://developer.blender.org/rB8b4e0eb88e715392490aefa520d2c5444f084a44
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.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list