[Bf-blender-cvs] [c4abb331027] blender2.8: Fixup for border render changes

Dalai Felinto noreply at git.blender.org
Fri Feb 23 21:28:16 CET 2018


Commit: c4abb331027ab294618c5ab49d3f9d2dfc67596f
Author: Dalai Felinto
Date:   Fri Feb 23 17:18:12 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBc4abb331027ab294618c5ab49d3f9d2dfc67596f

Fixup for border render changes

Although I fixed border rendering, I broke non-border rendering.

Issue introduced on:  0305fc30b3ba6a1b24e2c9c182ae2e76d553f341

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ac782a9541d..4049108d286 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3653,12 +3653,16 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
 
 	/* Main rendering loop. */
 
-	/* Init render result. */
 	const float *render_size = DRW_viewport_size_get();
-	RenderResult *render_result = RE_engine_begin_result(engine, 0, 0, (int)render_size[0], (int)render_size[1], NULL, NULL);
 	rctf view_rect;
 	rcti render_rect;
 	RE_GetViewPlane(render, &view_rect, &render_rect);
+	if (BLI_rcti_is_empty(&render_rect)) {
+		BLI_rcti_init(&render_rect, 0, size[0], 0, size[1]);
+	}
+
+	/* Init render result. */
+	RenderResult *render_result = RE_engine_begin_result(engine, 0, 0, (int)render_size[0], (int)render_size[1], NULL, NULL);
 
 	for (RenderView *render_view = render_result->views.first;
 	     render_view != NULL;



More information about the Bf-blender-cvs mailing list