[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56965] trunk/blender/source/blender/ render/intern/source/pipeline.c: Temporary fix for [#35467] wrong lines with panoramic camera.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Wed May 22 21:21:43 CEST 2013


Revision: 56965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56965
Author:   kjym3
Date:     2013-05-22 19:21:42 +0000 (Wed, 22 May 2013)
Log Message:
-----------
Temporary fix for [#35467] wrong lines with panoramic camera.
A warning message is shown when the panoramic camera is combined with Freestyle.

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-22 17:24:52 UTC (rev 56964)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-05-22 19:21:42 UTC (rev 56965)
@@ -2259,6 +2259,15 @@
 			BKE_report(reports, RPT_ERROR, "No ortho render possible for panorama");
 			return 0;
 		}
+
+#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;
+			}
+		}
+#endif
 	}
 
 	/* layer flag tests */




More information about the Bf-blender-cvs mailing list