From ae00011956fc09266ea867857557536e97d1fffa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 21 Jul 2015 16:00:55 +1000 Subject: Fix T45496: Crash loading file during preview Regression from multi-view --- source/blender/editors/render/render_preview.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/render') diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 9ed0cec5545..0a7455ba407 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -559,10 +559,16 @@ static bool ed_preview_draw_rect(ScrArea *sa, int split, int first, rcti *rect, RE_AcquireResultImageViews(re, &rres); - /* material preview only needs monoscopy (view 0) */ - rv = RE_RenderViewGetById(&rres, 0); + if (!BLI_listbase_is_empty(&rres.views)) { + /* material preview only needs monoscopy (view 0) */ + rv = RE_RenderViewGetById(&rres, 0); + } + else { + /* possible the job clears the views but we're still drawing T45496 */ + rv = NULL; + } - if (rv->rectf) { + if (rv && rv->rectf) { if (ABS(rres.rectx - newx) < 2 && ABS(rres.recty - newy) < 2) { -- cgit v1.2.3