[Bf-blender-cvs] [9b28ab2] master: Freestyle: disallow with fields (was crashing)

[Campbell Barton]

Commit: 9b28ab26b4d5624f253efff42b9b61b18f29fe5c
Author: Campbell Barton
Date:   Mon Sep 22 18:04:16 2014 +1000
Branches: master
https://developer.blender.org/rB9b28ab26b4d5624f253efff42b9b61b18f29fe5c

Freestyle: disallow with fields (was crashing)

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

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 f57520e..7e6d212 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2660,7 +2660,16 @@ bool RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *
 		}
 #endif
 	}
-	
+
+#ifdef WITH_FREESTYLE
+	if (scene->r.mode & R_EDGE_FRS) {
+		if (scene->r.mode & R_FIELDS) {
+			BKE_report(reports, RPT_ERROR, "Fields not supported in Freestyle");
+			return false;
+		}
+	}
+#endif
+
 	/* layer flag tests */
 	if (!render_scene_has_layers_to_render(scene)) {
 		BKE_report(reports, RPT_ERROR, "All render layers are disabled");