[Bf-blender-cvs] [22b913a] master: Fix T49121: VSE and border render incompatible

[Sergey Sharybin]

Commit: 22b913a27881b9bb8c4cb1738c803c8089ca0393
Author: Sergey Sharybin
Date:   Wed Aug 24 10:19:44 2016 +0200
Branches: master
https://developer.blender.org/rB22b913a27881b9bb8c4cb1738c803c8089ca0393

Fix T49121: VSE and border render incompatible

For now just check for such incompatible configuration, real fix
requires quite some work to be done.

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

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 ec629aa..9f1ae4a 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3059,6 +3059,13 @@ bool RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *
 	}
 #endif
 
+	if (RE_seq_render_active(scene, &scene->r)) {
+		if (scene->r.mode & R_BORDER) {
+			BKE_report(reports, RPT_ERROR, "Border rendering is not supported by sequencer");
+			return false;
+		}
+	}
+
 	/* layer flag tests */
 	if (!render_scene_has_layers_to_render(scene)) {
 		BKE_report(reports, RPT_ERROR, "All render layers are disabled");