Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2013-02-27 18:25:39 +0400
committerTon Roosendaal <ton@blender.org>2013-02-27 18:25:39 +0400
commita8c48058f9f93a45c84ab292ba8c1b1b66c0a39c (patch)
tree862bb333a04549608557d2be91a0c8edceb37b20 /source/blender/blenkernel/intern/node.c
parent713c9afb3927d12086c7bbcd11b947893e6ccc92 (diff)
Bug fix #34436
Two example files that crashed texture nodes. - On delete texture nodes, it should free the exec cache (because this cache stores the node pointer. - On redo, nodes can exist can exist without typeinfo set. Exec (free) code was not checking for that. Don't ask me why this happens... tex nodes are weird.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 86fe47268d6..3dbaab008f8 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -991,6 +991,12 @@ void nodeFreeNode(bNodeTree *ntree, bNode *node)
if (treetype->free_node_cache)
treetype->free_node_cache(ntree, node);
+
+ /* texture node has bad habit of keeping exec data around */
+ if (ntree->type == NTREE_TEXTURE && ntree->execdata) {
+ ntreeTexEndExecTree(ntree->execdata, 1);
+ ntree->execdata = NULL;
+ }
}
/* since it is called while free database, node->id is undefined */
@@ -1040,6 +1046,7 @@ void ntreeFreeTree_ex(bNodeTree *ntree, const short do_id_user)
break;
case NTREE_TEXTURE:
ntreeTexEndExecTree(ntree->execdata, 1);
+ ntree->execdata = NULL;
break;
}
}