Cleanup: remove unused R_ORTHO / R_PANORAMA flags.

2 files changed, 0 insertions, 22 deletions

diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 45caac4a37b..427c5b5aa49 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -157,8 +157,6 @@ static void re_camera_params_get(Render *re, CameraParams *params, Object *cam_o
 	re->clipend = params->clipend;
 
 	re->viewplane = params->viewplane;
-
-	BKE_camera_object_mode(&re->r, cam_ob);
 }
 
 void RE_SetOverrideCamera(Render *re, Object *camera)
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 9d220e181fa..47548c15b9c 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -939,7 +939,6 @@ void RE_SetWindow(Render *re, const rctf *viewplane, float clipsta, float clipen
 	re->viewplane = *viewplane;
 	re->clipsta = clipsta;
 	re->clipend = clipend;
-	re->r.mode &= ~R_ORTHO;
 
 	perspective_m4(re->winmat,
 	               re->viewplane.xmin, re->viewplane.xmax,
@@ -954,7 +953,6 @@ void RE_SetOrtho(Render *re, const rctf *viewplane, float clipsta, float clipend
 	re->viewplane = *viewplane;
 	re->clipsta = clipsta;
 	re->clipend = clipend;
-	re->r.mode |= R_ORTHO;
 
 	orthographic_m4(re->winmat,
 	                re->viewplane.xmin, re->viewplane.xmax,
@@ -1860,24 +1858,6 @@ bool RE_is_rendering_allowed(Scene *scene, ViewLayer *single_layer, Object *came
 		return 0;
 	}
 
-	/* get panorama & ortho, only after camera is set */
-	BKE_camera_object_mode(&scene->r, camera_override ? camera_override : scene->camera);
-
-	/* forbidden combinations */
-	if (scene->r.mode & R_PANORAMA) {
-		if (scene->r.mode & R_ORTHO) {
-			BKE_report(reports, RPT_ERROR, "No ortho render possible for panorama");
-			return 0;
-		}
-
-#ifdef WITH_FREESTYLE
-		if (scene->r.mode & R_EDGE_FRS) {
-			BKE_report(reports, RPT_ERROR, "Panoramic camera not supported in Freestyle");
-			return 0;
-		}
-#endif
-	}
-
 	if (RE_seq_render_active(scene, &scene->r)) {
 		if (scene->r.mode & R_BORDER) {
 			BKE_report(reports, RPT_ERROR, "Border rendering is not supported by sequencer");