[Bf-blender-cvs] [b9e62248ff8] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: b9e62248ff85139f9b995265149a201141af4c24
Author: Antonio Vazquez
Date:   Mon Jun 4 19:35:06 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb9e62248ff85139f9b995265149a201141af4c24

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/undo/ed_undo.c
index d0536c33439,d2ac346df10..8a5fdaefa6d
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -109,9 -107,7 +110,8 @@@ static int ed_undo_step(bContext *C, in
  	CLOG_INFO(&LOG, 1, "name='%s', step=%d", undoname, step);
  	wmWindowManager *wm = CTX_wm_manager(C);
  	wmWindow *win = CTX_wm_window(C);
- 	// Main *bmain = CTX_data_main(C);
  	Scene *scene = CTX_data_scene(C);
 +	ScrArea *sa = CTX_wm_area(C);
  
  	/* undo during jobs are running can easily lead to freeing data using by jobs,
  	 * or they can just lead to freezing job in some other cases */