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

Fix for group output memory leak, bug #27104. This happens when an internal node in a group has multiple output buffers, but only some of them are used. Then all the buffers would be created, but the unlinked outputs were not correctly tagged for freeing after group execution.

Browse Source
This commit is contained in:
Lukas Toenne
2011-04-23 07:21:10 +00:00
parent 25974319db
commit 6b4cecc466
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1997,11 +1997,23 @@ static void node_group_execute(bNodeStack *stack, void *data, bNode *gnode, bNod
if (ntree->type==NTREE_COMPOSIT) {
bNodeSocket *sock;
bNodeStack *ns;
/* clear hasoutput on all local stack data,
* only the group output will be used from now on
*/
for (node=ntree->nodes.first; node; node=node->next) {
for (sock=node->outputs.first; sock; sock=sock->next) {
if (sock->stack_type==SOCK_STACK_LOCAL) {
ns= get_socket_stack(stack, sock, in);
ns->hasoutput = 0;
}
}
}
/* use the hasoutput flag to tag external sockets */
for (sock=ntree->outputs.first; sock; sock=sock->next) {
/* use the hasoutput flag to tag external sockets */
if (sock->stack_type==SOCK_STACK_LOCAL) {
ns= get_socket_stack(stack, sock, in);
ns->hasoutput = 0;
ns->hasoutput = 1;
}
}
/* now free all stacks that are not used from outside */
@@ -2009,11 +2021,9 @@ static void node_group_execute(bNodeStack *stack, void *data, bNode *gnode, bNod
for (sock=node->outputs.first; sock; sock=sock->next) {
if (sock->stack_type==SOCK_STACK_LOCAL ) {
ns= get_socket_stack(stack, sock, in);
if (ns->hasoutput!=0 && ns->data) {
if (ns->hasoutput==0 && ns->data) {
free_compbuf(ns->data);
ns->data = NULL;
/* reset the flag */
ns->hasoutput = 1;
}
}
}