Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-05-22 23:21:42 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-05-22 23:21:42 +0400
commitba4fb6bf43dad0080e4c148ddf9acc9564748af1 (patch)
tree08b208a31c9087d12d7bb3f117843fdcc25b9ea5 /source/blender/render
parentf594e9b6acfe47d4f36282a787aa201c87bda37a (diff)
Temporary fix for [#35467] wrong lines with panoramic camera.
A warning message is shown when the panoramic camera is combined with Freestyle.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 5a672a57237..0c1899a66f6 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2259,6 +2259,15 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
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 */