kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for crash when duplicating image or render layer nodes.

Browse Source 
These nodes use cached buffers (in sock->cache), which need to be cleared when duplicating the node, otherwise the buffer will be freed twice.
This commit is contained in:
Lukas Toenne 2011-09-07 12:46:30 +00:00
parent 68693b4532
commit 7db716599c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,11 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
sock->stack_index= 0; sock->stack_index= 0;
sock->default_value = (oldsock->default_value ? MEM_dupallocN(oldsock->default_value) : NULL); sock->default_value = (oldsock->default_value ? MEM_dupallocN(oldsock->default_value) : NULL);
/* XXX some compositor node (e.g. image, render layers) still store
* some persistent buffer data here, need to clear this to avoid dangling pointers.
*/
sock->cache = NULL;
} }
BLI_duplicatelist(&nnode->outputs, &node->outputs); BLI_duplicatelist(&nnode->outputs, &node->outputs);
@ -407,6 +412,11 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
sock->stack_index= 0; sock->stack_index= 0;
sock->default_value = (oldsock->default_value ? MEM_dupallocN(oldsock->default_value) : NULL); sock->default_value = (oldsock->default_value ? MEM_dupallocN(oldsock->default_value) : NULL);
/* XXX some compositor node (e.g. image, render layers) still store
* some persistent buffer data here, need to clear this to avoid dangling pointers.
*/
sock->cache = NULL;
} }
/* don't increase node->id users, freenode doesn't decrement either */ /* don't increase node->id users, freenode doesn't decrement either */

4
source/blender/nodes/composite/node_composite_tree.c
View File

@ -362,7 +362,7 @@ static int setExecutableNodes(bNodeTreeExec *exec, ThreadData *thd)
int a; int a;
node = nodeexec->node; node = nodeexec->node;
node_get_stack(node, thd->stack, nsin, nsout); node_get_stack(node, exec->stack, nsin, nsout);
/* test the outputs */ /* test the outputs */
/* skip value-only nodes (should be in type!) */ /* skip value-only nodes (should be in type!) */
@ -428,7 +428,7 @@ static int setExecutableNodes(bNodeTreeExec *exec, ThreadData *thd)
node = nodeexec->node; node = nodeexec->node;
if(node->need_exec==0 && node_only_value(node)) { if(node->need_exec==0 && node_only_value(node)) {
if(node->typeinfo->execfunc) { if(node->typeinfo->execfunc) {
node_get_stack(node, thd->stack, nsin, nsout); node_get_stack(node, exec->stack, nsin, nsout);
node->typeinfo->execfunc(thd->rd, node, nsin, nsout); node->typeinfo->execfunc(thd->rd, node, nsin, nsout);
} }
} }