sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for crash when loading a file while rendering.

Browse Source
This commit is contained in:
Campbell Barton 2012-06-01 15:05:30 +00:00
parent 392ee8fc6a
commit 04466171c1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/render/render_internal.c
View File

@ -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);