diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
| commit | ae25aa22105b060294095357692f2aed4c650ce8 (patch) | |
| tree | 06548276f86326f21943f8ec7ef92765a97b5ab5 /source/blender/editors/space_buttons | |
| parent | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (diff) | |
| parent | 03762409cd4f812d152e42de9c4f9853df91be0b (diff) | |
svn merge ^/trunk/blender -r55372:55392
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 1643921e4dd..bb1310d486a 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -113,7 +113,7 @@ static void buttons_texture_users_find_nodetree(ListBase *users, ID *id, { bNode *node; - if (ntree) { + if (ntreeIsValid(ntree)) { for (node = ntree->nodes.first; node; node = node->next) { if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) { PointerRNA ptr; |