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:
authorCampbell Barton <ideasman42@gmail.com>2013-07-27 12:21:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-27 12:21:43 +0400
commitf4f90e73e1ddd54409274272765c667a59f890b2 (patch)
tree0ac26901f5e2cc71dca126e407f1205ad9e4dcb1 /source/blender/nodes/texture
parentd894e5e762e66c0ae81bdb305b9b023e923c7d7a (diff)
fix for writing to freed memory enabling texture node tree
Diffstat (limited to 'source/blender/nodes/texture')
-rw-r--r--source/blender/nodes/texture/node_texture_tree.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index 859636ed4e5..5e863da9635 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -283,10 +283,12 @@ void ntreeTexEndExecTree_internal(bNodeTreeExec *exec)
void ntreeTexEndExecTree(bNodeTreeExec *exec)
{
if (exec) {
+ /* exec may get freed, so assign ntree */
+ bNodeTree *ntree = exec->nodetree;
ntreeTexEndExecTree_internal(exec);
/* XXX clear nodetree backpointer to exec data, same problem as noted in ntreeBeginExecTree */
- exec->nodetree->execdata = NULL;
+ ntree->execdata = NULL;
}
}