Merge branch 'master' into blender2.8

Conflicts: source/blender/editors/screen/screen_edit.c
2018-07-06 14:03:51 +02:00 · 2018-07-06 14:03:51 +02:00 · 2aba2de92b
parent 843d5d707d 0987c11c76
commit 2aba2de92b
1 changed files with 1 additions and 1 deletions
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@ -97,7 +97,7 @@ bool ED_scene_delete(bContext *C, Main *bmain, wmWindow *win, Scene *scene)
 {
 	Scene *scene_new;

-	// kill running jobs
+	/* kill running jobs */
 	wmWindowManager *wm = bmain->wm.first;
 	WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_ANY);