diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-05-22 00:59:54 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-05-22 00:59:54 +0400 |
| commit | f13d63ca48391e8ef2b57f4d336883a13f594f28 (patch) | |
| tree | e3c817b8ca5a0fcdab3d2acb1f67d98b42880a16 /source/blender/src/renderwin.c | |
| parent | 33c0ebbc8e7a899900738fb57ec3a6e58dc27249 (diff) | |
Brought back the Scene strip in Sequencer. Even does a full composite with
only images input in compositor. Currently still renders in the scene's
own resolution. It also doesn't show scanline/tile updates yet while
rendering.
Diffstat (limited to 'source/blender/src/renderwin.c')
| -rw-r--r-- | source/blender/src/renderwin.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 8032d443b8f..d479b9e3747 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1060,7 +1060,8 @@ static void do_render(int anim) unsigned int lay= G.scene->lay; int scemode= G.scene->r.scemode; - /* we set this flag to prevent renderwindow queue to execute another render */ + /* UGLY! we set this flag to prevent renderwindow queue to execute another render */ + /* is reset in RE_BlenderFrame */ G.rendering= 1; G.afbreek= 0; @@ -1111,10 +1112,7 @@ static void do_render(int anim) // BIF_preview_changed(ID_TE); // } allqueue(REDRAWBUTSSCENE, 0); // visualize fbuf for example - - // before scene update! - G.rendering= 0; - + scene_update_for_newframe(G.scene, G.scene->lay); // no redraw needed, this restores to view as we left it waitcursor(0); |