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

Compositor: the default now doesn't include a Viewer node anymore, was too

Browse Source 
confusing.
This commit is contained in:
Ton Roosendaal
2006-06-19 12:47:37 +00:00
parent 0953e9add4
commit cbe9fc4e44
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,7 +333,7 @@ void node_shader_default(Material *ma)
/* called from shading buttons or header */ /* called from shading buttons or header */
void node_composit_default(Scene *sce) void node_composit_default(Scene *sce)
{ {
bNode *in, *out1, *out2; bNode *in, *out;
bNodeSocket *fromsock, *tosock; bNodeSocket *fromsock, *tosock;
/* but lets check it anyway */ /* but lets check it anyway */
@@ -344,10 +344,8 @@ void node_composit_default(Scene *sce)
sce->nodetree= ntreeAddTree(NTREE_COMPOSIT); sce->nodetree= ntreeAddTree(NTREE_COMPOSIT);
out1= nodeAddNodeType(sce->nodetree, CMP_NODE_VIEWER, NULL); out= nodeAddNodeType(sce->nodetree, CMP_NODE_COMPOSITE, NULL);
out1->locx= 300.0f; out1->locy= 200.0f; out->locx= 300.0f; out->locy= 400.0f;
out2= nodeAddNodeType(sce->nodetree, CMP_NODE_COMPOSITE, NULL);
out2->locx= 300.0f; out2->locy= 500.0f;
in= nodeAddNodeType(sce->nodetree, CMP_NODE_R_LAYERS, NULL); in= nodeAddNodeType(sce->nodetree, CMP_NODE_R_LAYERS, NULL);
in->locx= 10.0f; in->locy= 400.0f; in->locx= 10.0f; in->locy= 400.0f;
@@ -355,21 +353,10 @@ void node_composit_default(Scene *sce)
/* links from color to color */ /* links from color to color */
fromsock= in->outputs.first; fromsock= in->outputs.first;
tosock= out1->inputs.first; tosock= out->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out1, tosock); nodeAddLink(sce->nodetree, in, fromsock, out, tosock);
tosock= out2->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out2, tosock);
ntreeSolveOrder(sce->nodetree); /* needed for pointers */ ntreeSolveOrder(sce->nodetree); /* needed for pointers */
out1->id= find_id("IM", "Viewer Node");
if(out1->id==NULL) {
Image *ima= alloc_libblock(&G.main->image, ID_IM, "Viewer Node");
strcpy(ima->name, "Viewer Node");
ima->ok= 1;
ima->xrep= ima->yrep= 1;
out1->id= &ima->id;
}
} }
/* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */ /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */