[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57166] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix for r56965 by Tamito:

[Thomas Dinges]

Revision: 57166
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57166
Author:   dingto
Date:     2013-06-01 02:14:07 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56965

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2013-05-31 23:52:39 UTC (rev 57165)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-06-01 02:14:07 UTC (rev 57166)
@@ -2270,11 +2270,9 @@
 		}
 
 #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
 	}