Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-01-20 13:30:19 +0300
committerJeroen Bakker <jeroen@blender.org>2020-01-28 17:54:34 +0300
commitd33f4bce8dc0764c14c173a37570b427a15df8e8 (patch)
tree8abe85fe508c3f5fd529c53dbaf8f82df148206d /source/blender/render
parentecab41e44f7913ee97bae7c339ab95523111d46a (diff)
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
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/render_result.c4
1 files changed, 2 insertions, 2 deletions
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,