diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-15 21:00:46 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-15 21:00:46 +0300 |
| commit | ebfb96c12509faa005ac8f3888497fb74b4449f4 (patch) | |
| tree | d20c76357848081decf2620530ca6fcd83b14957 /source/blender/blenloader | |
| parent | 86bbab7de53b07ad9a45b11dbff6bd5c0ee40c14 (diff) | |
Bugfix:
Texture nodes, the Image node didn't get initialized on load.
This caused the node to refuse accepting a new Image if a
file couldn't be found on saving.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a8eaa700da0..9619a111ddb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2104,8 +2104,11 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree) else if(ELEM3(node->type, CMP_NODE_IMAGE, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) ((ImageUser *)node->storage)->ok= 1; } - else if( ntree->type==NTREE_TEXTURE && (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) ) { - direct_link_curvemapping(fd, node->storage); + else if( ntree->type==NTREE_TEXTURE) { + if(node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) + direct_link_curvemapping(fd, node->storage); + else if(node->type==TEX_NODE_IMAGE) + ((ImageUser *)node->storage)->ok= 1; } } link_list(fd, &node->inputs); |