[Bf-blender-cvs] [0fe04593a85] topbar: Merge branch 'blender2.8' into topbar

[Julian Eisel]

Commit: 0fe04593a85ffee0f924d311905d81b516d22f40
Author: Julian Eisel
Date:   Thu Jul 27 13:16:55 2017 +0200
Branches: topbar
https://developer.blender.org/rB0fe04593a85ffee0f924d311905d81b516d22f40

Merge branch 'blender2.8' into topbar

Conflicts:
	source/blender/windowmanager/intern/wm_event_system.c

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_event_system.c
index bfbbe73506e,74f8088f377..68f4ab4abe0
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -2719,17 -2725,15 +2729,17 @@@ void WM_event_add_fileselect(bContext *
  
  					if (sfile->op == handler->op) {
  						CTX_wm_area_set(C, sa);
- 						wm_handler_fileselect_do(C, &win->handlers, handler, EVT_FILESELECT_CANCEL);
+ 						wm_handler_fileselect_do(C, &win->modalhandlers, handler, EVT_FILESELECT_CANCEL);
 +						cancel_handler = false;
  						break;
  					}
  				}
  			}
  
  			/* if not found we stop the handler without changing the screen */
 -			if (!sa)
 +			if (cancel_handler) {
- 				wm_handler_fileselect_do(C, &win->handlers, handler, EVT_FILESELECT_EXTERNAL_CANCEL);
+ 				wm_handler_fileselect_do(C, &win->modalhandlers, handler, EVT_FILESELECT_EXTERNAL_CANCEL);
 +			}
  		}
  	}