Merge branch 'master' into blender2.8

6 files changed, 0 insertions, 6 deletions

diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index d7b92c00ed4..77bf16f5e22 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -98,4 +98,3 @@ void RENDER_OT_view_cancel(struct wmOperatorType *ot);
 void RENDER_OT_opengl(struct wmOperatorType *ot);
 
 #endif /* __RENDER_INTERN_H__ */
-
diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c
index dd5ed5b78f1..fd534dd9129 100644
--- a/source/blender/editors/render/render_ops.c
+++ b/source/blender/editors/render/render_ops.c
@@ -95,4 +95,3 @@ void ED_operatortypes_render(void)
 	/* render_opengl.c */
 	WM_operatortype_append(RENDER_OT_opengl);
 }
-
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index d47291ca82f..04632838cf3 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1260,4 +1260,3 @@ void ED_preview_kill_jobs(wmWindowManager *wm, Main *UNUSED(bmain))
 	if (wm)
 		WM_jobs_kill(wm, NULL, common_preview_startjob);
 }
-
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index a822dabf7b4..3d67095263f 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -1694,4 +1694,3 @@ void TEXTURE_OT_slot_paste(wmOperatorType *ot)
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
 }
-
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index b7e6508117e..a78617fde8c 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -371,4 +371,3 @@ void ED_render_id_flush_update(const DEGEditorUpdateContext *update_ctx, ID *id)
 			break;
 	}
 }
-
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index 351ceda90e3..12f9c8f40c1 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -353,4 +353,3 @@ void RENDER_OT_view_show(struct wmOperatorType *ot)
 	ot->invoke = render_view_show_invoke;
 	ot->poll = ED_operator_screenactive;
 }
-