diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 19:05:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 19:05:30 +0400 |
| commit | 04466171c1e7af306693ea0dcaea1cd308a1591d (patch) | |
| tree | 70592ac80546bf316d77092b511b258894e75ec8 /source/blender/editors/render/render_internal.c | |
| parent | 392ee8fc6a553e6bb35efe3dc9a5486fe50da7e9 (diff) | |
fix for crash when loading a file while rendering.
Diffstat (limited to 'source/blender/editors/render/render_internal.c')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index b7bd027ba7f..356ede878b5 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -407,8 +407,12 @@ static void render_endjob(void *rjv) free_main(rj->main); /* else the frame will not update for the original value */ - if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) - ED_update_for_newframe(G.main, rj->scene, 1); + if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { + /* possible this fails of loading new file while rendering */ + if (G.main->wm.first) { + ED_update_for_newframe(G.main, rj->scene, 1); + } + } /* XXX above function sets all tags in nodes */ ntreeCompositClearTags(rj->scene->nodetree); |