Fix for r56965 by Tamito:

* Panorama Camera was not working for Blender Internal and Cycles anymore.

Code checked for Freestyle render layer flag, but as the flag is enabled per default, it broke Panorama camera in all cases. It made no sense to check this on a render layer basis anyway... check if Freestyle is enabled in general now instead.

1 files changed, 3 insertions, 5 deletions

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index d35121e8ae5..c8f8f844e5f 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2270,11 +2270,9 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 		}
 
 #ifdef WITH_FREESTYLE
-		for (srl = scene->r.layers.first; srl; srl = srl->next) {
-			if (FRS_is_freestyle_enabled(srl)) {
-				BKE_report(reports, RPT_ERROR, "Panoramic camera not supported in Freestyle");
-				return 0;
-			}
+		if ((scene->r.mode & R_EDGE_FRS) && (!BKE_scene_use_new_shading_nodes(scene))) {
+			BKE_report(reports, RPT_ERROR, "Panoramic camera not supported in Freestyle");
+			return 0;
 		}
 #endif
 	}