diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-07-06 15:03:51 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-07-06 15:03:51 +0300 |
| commit | 2aba2de92bf0f55a3a390884566615d6d0562db4 (patch) | |
| tree | 80587e87c7fc03687637dcce061e03a9d69517a6 /source/blender/editors/scene | |
| parent | 843d5d707deec1c58534c879dca23c03bd64f249 (diff) | |
| parent | 0987c11c768367f2d236683c6ae0c39c55891bbd (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/screen/screen_edit.c
Diffstat (limited to 'source/blender/editors/scene')
| -rw-r--r-- | source/blender/editors/scene/scene_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 1604abb5c3c..1f4e86f89ab 100644 --- 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); |