diff options
author | Thomas Dinges <blender@dingto.org> | 2012-11-04 05:32:39 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-11-04 05:32:39 +0400 |
commit | 2f2c0a51a5b108213004dcda3da6defda82e6e41 (patch) | |
tree | 9f59361daa92acfcf47f86dbde1d4ad71cd69d02 /source/blender/blenkernel | |
parent | 61bc63799ec64ce9355778c6703b492c255321bc (diff) |
Fix for r51837.
* mat->nodetree is accessed regardless of whether or not the material node is in use-
Patch provided by Tamito Kajiyama, thanks!
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 5995e69a73a..b3497b9932f 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -591,6 +591,8 @@ void BKE_text_unlink(Main *bmain, Text *text) /* nodes */ for (mat = bmain->mat.first; mat; mat = mat->id.next) { ntree = mat->nodetree; + if (!ntree) + continue; for (node = ntree->nodes.first; node; node = node->next) { if (node->type == SH_NODE_SCRIPT) { Text *ntext = (Text *)node->id; |