[Bf-blender-cvs] [ae00011] master: Fix T45496: Crash loading file during preview
Campbell Barton
noreply at git.blender.org
Tue Jul 21 08:07:11 CEST 2015
Commit: ae00011956fc09266ea867857557536e97d1fffa
Author: Campbell Barton
Date: Tue Jul 21 16:00:55 2015 +1000
Branches: master
https://developer.blender.org/rBae00011956fc09266ea867857557536e97d1fffa
Fix T45496: Crash loading file during preview
Regression from multi-view
===================================================================
M source/blender/editors/render/render_preview.c
===================================================================
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 9ed0cec..0a7455b 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) {
More information about the Bf-blender-cvs
mailing list