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

Julian Eisel noreply at git.blender.org
Sat May 12 15:31:24 CEST 2018


Commit: ca4964a37a1ac6a67913015853e16afca51f6f67
Author: Julian Eisel
Date:   Sat May 12 15:14:48 2018 +0200
Branches: topbar
https://developer.blender.org/rBca4964a37a1ac6a67913015853e16afca51f6f67

Merge branch 'blender2.8' into topbar

Keeping the branch for now, I might delete it soon though.

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



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

diff --cc source/blender/windowmanager/intern/wm_window.c
index 166d97d6b5e,2d94cc1dae7..49adfcefd4e
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -304,12 -302,7 +302,8 @@@ wmWindow *wm_window_copy(bContext *C, w
  	WM_window_set_active_workspace(win_dst, workspace);
  	layout_new = duplicate_layout ? ED_workspace_layout_duplicate(workspace, layout_old, win_dst) : layout_old;
  	WM_window_set_active_layout(win_dst, workspace, layout_new);
 +	ED_screen_global_areas_create(win_dst);
  
- 	win_dst->drawmethod = U.wmdrawmethod;
- 
- 	BLI_listbase_clear(&win_dst->drawdata);
- 
  	*win_dst->stereo3d_format = *win_src->stereo3d_format;
  
  	return win_dst;



More information about the Bf-blender-cvs mailing list