[Bf-blender-cvs] [f4840e8] master: Fix T47848: Fix regression in sequencer GL render

[Campbell Barton]

Commit: f4840e878b95e87d60a8b66fad9a5777ce380dc5
Author: Campbell Barton
Date:   Mon Mar 21 16:36:20 2016 +1100
Branches: master
https://developer.blender.org/rBf4840e878b95e87d60a8b66fad9a5777ce380dc5

Fix T47848: Fix regression in sequencer GL render

Own changes in 2.77 broke off-screen render with scene render size doesn't match output.

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

M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 4d7cc28..8c2d787 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3309,13 +3309,19 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 	RegionView3D *rv3d = ar->regiondata;
 	ImBuf *ibuf;
 	const bool draw_sky = (alpha_mode == R_ADDSKY);
-	const bool own_ofs = (ofs == NULL);
 
 	/* view state */
 	GPUFXSettings fx_settings = v3d->fx_settings;
 	bool is_ortho = false;
 	float winmat[4][4];
 
+	if (ofs && ((GPU_offscreen_width(ofs) != sizex) || (GPU_offscreen_height(ofs) != sizey))) {
+		/* sizes differ, can't reuse */
+		ofs = NULL;
+	}
+
+	const bool own_ofs = (ofs == NULL);
+
 	if (own_ofs) {
 		/* bind */
 		ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, err_out);