diff options
author | Ton Roosendaal <ton@blender.org> | 2006-02-03 02:55:14 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-02-03 02:55:14 +0300 |
commit | 8e12f750f2235e61c399d3d04c2aa804dd26cadc (patch) | |
tree | e216f29dc9ad0a34f345056b821b1a36677d0ebb | |
parent | ef47cb25a0c3845097d2d18e701387821592eaf5 (diff) |
- Preview images get generated on render event again
- disabled threading for composit for now, it has a memory error still...
will work on that tomorrow more.
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index e2dc623859e..4ce098f7d27 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1711,7 +1711,7 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview) if(ntree==NULL) return; if(rd->mode & R_THREADS) - maxthreads= 2; + maxthreads= 1; else maxthreads= 1; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index b07145c119c..a420702f84b 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -836,6 +836,15 @@ static void do_render_fields(Render *re) } +static void ntree_render_scenes(Render *re) +{ + SceneRenderLayer *srl; + + for(srl= re->r.layers.first; srl; srl= srl->next) { + + } +} + static void do_render_final(Render *re, Scene *scene) { /* we set start time here, for main Blender loops */ @@ -867,11 +876,14 @@ static void do_render_final(Render *re, Scene *scene) } if(!re->test_break()) { + /* checks if there are layer nodes that need scene */ + ntree_render_scenes(re); + ntreeCompositTagRender(scene->nodetree); ntreeCompositTagAnimated(scene->nodetree); if(re->r.scemode & R_DOCOMP) - ntreeCompositExecTree(scene->nodetree, &re->r, 0); + ntreeCompositExecTree(scene->nodetree, &re->r, G.background==0); } } @@ -980,7 +992,6 @@ static int render_initialize_from_scene(Render *re, Scene *scene) } /* general Blender frame render call */ -/* should return 1 when all is OK, otherwise it throws up errors */ void RE_BlenderFrame(Render *re, Scene *scene, int frame) { /* ugly global still... is to prevent renderwin events and signal subsurfs etc to make full resol */ |