Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Another fix for node groups: Internal socket stack did not get complete initialization of the sockettype value, leading to wrong b/w outputs.

Browse Source
This commit is contained in:
Lukas Toenne
2011-04-24 05:13:35 +00:00
parent 040a049fb1
commit 5c4743b9ee
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/blenkernel/intern/node.c
View File

@@ -2244,16 +2244,40 @@ static void group_tag_used_outputs(bNode *gnode, bNodeStack *stack, bNodeStack *
}
}
/* set stack types (for local stack entries) */
for(sock= node->outputs.first; sock; sock= sock->next) {
bNodeStack *ns = get_socket_stack(stack, sock, NULL);
if (ns)
ns->sockettype = sock->type;
}
/* non-composite trees do all nodes by default */
if (ntree->type!=NTREE_COMPOSIT)
node->need_exec = 1;
for(sock= node->inputs.first; sock; sock= sock->next) {
bNodeStack *ns = get_socket_stack(stack, sock, gin);
if (ns) {
ns->hasoutput = 1;
/* sock type is needed to detect rgba or value or vector types */
if(sock->link && sock->link->fromsock)
ns->sockettype= sock->link->fromsock->type;
else
sock->ns.sockettype= sock->type;
}
if(sock->link) {
bNodeLink *link= sock->link;
/* this is the test for a cyclic case */
if(link->fromnode && link->tonode) {
if(link->fromnode->level >= link->tonode->level && link->tonode->level!=0xFFF);
else {
node->need_exec= 0;
}
}
}
}
/* set stack types (for local stack entries) */
for(sock= node->outputs.first; sock; sock= sock->next) {
bNodeStack *ns = get_socket_stack(stack, sock, gin);
if (ns)
ns->sockettype = sock->type;
}
}
}