diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-11 13:30:30 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-11 13:30:30 +0300 |
commit | e2c0197a96dbac2aee519fbfb142441c6aed0963 (patch) | |
tree | 71d45ebf954c14a9906547e05949313169e7eb24 /source/blender/blenkernel/intern/node.c | |
parent | 2325d15d02e9e0b1fda2586ad5ffbe8364e706f4 (diff) | |
parent | e26f61a2b5071ba4e587dbee62e55ad46519a5d9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 82092fedbe3..0ec6d930e07 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1700,11 +1700,12 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat ntreeTexEndExecTree(ntree->execdata); ntree->execdata = NULL; } - - if (node->typeinfo->freefunc) - node->typeinfo->freefunc(node); } - + + if (node->typeinfo->freefunc) { + node->typeinfo->freefunc(node); + } + for (sock = node->inputs.first; sock; sock = nextsock) { nextsock = sock->next; node_socket_free(ntree, sock, node); |