diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
| commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
| tree | a86991622fa5582498612cf348d0de58af048a08 /source/blender/blenkernel/intern/texture.c | |
| parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
| parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) | |
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 372c51b0da5..9300b39a767 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -420,6 +420,11 @@ void free_texture(Tex *tex) BKE_previewimg_free(&tex->preview); BKE_icon_delete((struct ID*)tex); tex->id.icon_id = 0; + + if(tex->nodetree) { + ntreeFreeTree(tex->nodetree); + MEM_freeN(tex->nodetree); + } } /* ------------------------------------------------------------------------- */ @@ -577,6 +582,11 @@ Tex *copy_texture(Tex *tex) if(tex->preview) texn->preview = BKE_previewimg_copy(tex->preview); + if(tex->nodetree) { + ntreeEndExecTree(tex->nodetree); + texn->nodetree= ntreeCopyTree(tex->nodetree, 0); /* 0 == full new tree */ + } + return texn; } @@ -727,6 +737,10 @@ void autotexname(Tex *tex) char di[FILE_MAXDIR], fi[FILE_MAXFILE]; if(tex) { + if(tex->use_nodes) { + new_id(&G.main->tex, (ID *)tex, "Noddy"); + } + else if(tex->type==TEX_IMAGE) { ima= tex->ima; if(ima) { |