[Bf-blender-cvs] [e5b2e9c] master: Fix T41800: Freestyle + Cycles panoramic camera not compatible, renders are incorrect.

[Tamito Kajiyama]

Commit: e5b2e9cdd34f071b059a166bdbbc13eeca6bb4dc
Author: Tamito Kajiyama
Date:   Sat Sep 13 11:39:01 2014 +0900
Branches: master
https://developer.blender.org/rBe5b2e9cdd34f071b059a166bdbbc13eeca6bb4dc

Fix T41800: Freestyle + Cycles panoramic camera not compatible, renders are 
incorrect.

===================================================================

M       source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c 
b/source/blender/render/intern/source/pipeline.c
index 8469d8c..32bd67c 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;
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs