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

[Julian Eisel]

Commit: a11ecbd8efed454d5371bcfab660b92a61b98215
Author: Julian Eisel
Date:   Fri Oct 6 23:28:06 2017 +0200
Branches: topbar
https://developer.blender.org/rBa11ecbd8efed454d5371bcfab660b92a61b98215

Merge branch 'blender2.8' into topbar

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



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

diff --cc source/blender/windowmanager/intern/wm_event_system.c
index cc03bd11569,f3864f7ed97..a34e3d76a4c
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -352,13 -352,6 +352,13 @@@ void wm_event_do_notifiers(bContext *C
  						if (G.debug & G_DEBUG_EVENTS)
  							printf("%s: Workspace set %p\n", __func__, note->reference);
  					}
 +					else if (note->data == ND_WORKSPACE_DELETE) {
 +						WorkSpace *workspace = note->reference;
 +
- 						ED_workspace_delete(workspace, CTX_data_main(C), C, wm, win);   // XXX hrms, think this over!
++						ED_workspace_delete(workspace, CTX_data_main(C), C, wm);   // XXX hrms, think this over!
 +						if (G.debug & G_DEBUG_EVENTS)
 +							printf("%s: Workspace delete %p\n", __func__, workspace);
 +					}
  					else if (note->data == ND_LAYOUTBROWSE) {
  						bScreen *ref_screen = BKE_workspace_layout_screen_get(note->reference);