archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

A couple of render improvements;

Browse Source 
- Bug fix: the upper tile in a collumn for Panorama render didn't put the
  mainthread to sleep properly. Now panorama renders 25% faster if you had
  set Y-Parts to 4.

- Enabling Compositing in Scene for first time now adds a "Composite" node
  too, so render output gets applied.
- An attempt to render with "Do Composite" without "Composite" node will
  throw an error and stops rendering. In background mode it will just not
  render at all, and print errors.
- Errors that prevent rendering now give a popup menu again.
- Having MBlur or Fields option on will now normally render, but with an
  error print in console (not done yet...)
This commit is contained in:
Ton Roosendaal
2006-03-12 11:51:56 +00:00
parent 4e4cd9407d
commit 8a8c70c63a
6 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/src/editnode.c
View File

@@ -333,7 +333,7 @@ void node_shader_default(Material *ma)
/* called from shading buttons or header */
void node_composit_default(Scene *sce)
{
bNode *in, *out;
bNode *in, *out1, *out2;
bNodeSocket *fromsock, *tosock;
/* but lets check it anyway */
@@ -344,27 +344,31 @@ void node_composit_default(Scene *sce)
sce->nodetree= ntreeAddTree(NTREE_COMPOSIT);
out= nodeAddNodeType(sce->nodetree, CMP_NODE_VIEWER, NULL);
out->locx= 300.0f; out->locy= 300.0f;
out1= nodeAddNodeType(sce->nodetree, CMP_NODE_VIEWER, NULL);
out1->locx= 300.0f; out1->locy= 200.0f;
out2= nodeAddNodeType(sce->nodetree, CMP_NODE_COMPOSITE, NULL);
out2->locx= 300.0f; out2->locy= 500.0f;
in= nodeAddNodeType(sce->nodetree, CMP_NODE_R_RESULT, NULL);
in->locx= 10.0f; in->locy= 300.0f;
in->locx= 10.0f; in->locy= 400.0f;
nodeSetActive(sce->nodetree, in);
/* only a link from color to color */
/* links from color to color */
fromsock= in->outputs.first;
tosock= out->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out, tosock);
tosock= out1->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out1, tosock);
tosock= out2->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out2, tosock);
ntreeSolveOrder(sce->nodetree); /* needed for pointers */
out->id= find_id("IM", "Compositor");
if(out->id==NULL) {
out1->id= find_id("IM", "Compositor");
if(out1->id==NULL) {
Image *ima= alloc_libblock(&G.main->image, ID_IM, "Compositor");
strcpy(ima->name, "Compositor");
ima->ok= 1;
ima->xrep= ima->yrep= 1;
out->id= &ima->id;
out1->id= &ima->id;
}
}