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:
authorThomas Dinges <blender@dingto.org>2012-11-04 05:32:39 +0400
committerThomas Dinges <blender@dingto.org>2012-11-04 05:32:39 +0400
commit2f2c0a51a5b108213004dcda3da6defda82e6e41 (patch)
tree9f59361daa92acfcf47f86dbde1d4ad71cd69d02 /source/blender/blenkernel/intern/text.c
parent61bc63799ec64ce9355778c6703b492c255321bc (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/intern/text.c')
-rw-r--r--source/blender/blenkernel/intern/text.c2
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;