[Bf-blender-cvs] [f36de27] blender-v2.77-release: Fix T47848: Fix regression in sequencer GL render
Campbell Barton
noreply at git.blender.org
Tue Apr 5 10:45:13 CEST 2016
Commit: f36de2733965c96117aa9b68053c0fffa805779a
Author: Campbell Barton
Date: Mon Mar 21 16:36:20 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rBf36de2733965c96117aa9b68053c0fffa805779a
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 d81ef17..8c2d787 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3308,14 +3308,20 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
{
RegionView3D *rv3d = ar->regiondata;
ImBuf *ibuf;
- const bool draw_sky = (alpha_mode == R_ADDSKY) && v3d && (v3d->flag3 & V3D_SHOW_WORLD);
- const bool own_ofs = (ofs == NULL);
+ const bool draw_sky = (alpha_mode == R_ADDSKY);
/* 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);
More information about the Bf-blender-cvs
mailing list