diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-07 21:09:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-07 21:09:27 +0300 |
| commit | c8be8a7c6dfd84e6e3e0f51f85fa44760a137b60 (patch) | |
| tree | d4f491be494ab4000c7c6b7fbce171f727afb07f /source/blender/editors/render | |
| parent | 5c421c328e963fe27725e6961e60de74cca87c7f (diff) | |
Bugfix 25965
New "auto render" now prevents calling anim-updates, that's
not needed (and popped back transformed keyed objects).
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f38a5691a6f..341f56667fa 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -594,11 +594,15 @@ static void render_endjob(void *rjv) free_main(rj->main); /* else the frame will not update for the original value */ - ED_update_for_newframe(G.main, rj->scene, rj->win->screen, 1); + if(!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) + ED_update_for_newframe(G.main, rj->scene, rj->win->screen, 1); /* XXX above function sets all tags in nodes */ ntreeClearTags(rj->scene->nodetree); + /* potentially set by caller */ + rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE; + if(rj->srl) { NodeTagIDChanged(rj->scene->nodetree, &rj->scene->id); WM_main_add_notifier(NC_NODE|NA_EDITED, rj->scene); |