[Bf-blender-cvs] [d33f4bce8dc] blender-v2.82-release: Fix T67006: Crash RenderEngine with preview
Jeroen Bakker
noreply at git.blender.org
Tue Jan 28 15:55:08 CET 2020
Commit: d33f4bce8dc0764c14c173a37570b427a15df8e8
Author: Jeroen Bakker
Date: Mon Jan 20 11:30:19 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBd33f4bce8dc0764c14c173a37570b427a15df8e8
Fix T67006: Crash RenderEngine with preview
In a minimal render engine blender crashes as it cannot create a preview
of the material yet. This patch adds a failsafe test for this specific
scenario.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6633
===================================================================
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index b5c2db96c47..0bf03347b80 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1547,10 +1547,10 @@ void render_result_rect_get_pixels(RenderResult *rr,
{
RenderView *rv = RE_RenderViewGetById(rr, view_id);
- if (rv->rect32) {
+ if (rv && rv->rect32) {
memcpy(rect, rv->rect32, sizeof(int) * rr->rectx * rr->recty);
}
- else if (rv->rectf) {
+ else if (rv && rv->rectf) {
IMB_display_buffer_transform_apply((unsigned char *)rect,
rv->rectf,
rr->rectx,
More information about the Bf-blender-cvs
mailing list