Freestyle: disallow with fields (was crashing)

2014-09-22 18:04:16 +10:00
parent ef0883bc2b
commit 9b28ab26b4
1 changed files with 10 additions and 1 deletions
--- 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");