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>2014-09-13 06:39:01 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-09-13 06:40:08 +0400
commite5b2e9cdd34f071b059a166bdbbc13eeca6bb4dc (patch)
treebe6f79b2c01f2785ec8c984d1c7315123f85c971 /source/blender
parentbd671f10055b86a6a2a114f8e323414823ce18d2 (diff)
Fix T41800: Freestyle + Cycles panoramic camera not compatible, renders are incorrect.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/render/intern/source/pipeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8469d8c74f0..32bd67cb1f2 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2645,7 +2645,7 @@ bool RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *
}
#ifdef WITH_FREESTYLE
- if ((scene->r.mode & R_EDGE_FRS) && (!BKE_scene_use_new_shading_nodes(scene))) {
+ if (scene->r.mode & R_EDGE_FRS) {
BKE_report(reports, RPT_ERROR, "Panoramic camera not supported in Freestyle");
return 0;
}