diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-12 13:49:46 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-12 13:49:46 +0400 |
| commit | bd34ecafef86925d7682495a923fee34af783acd (patch) | |
| tree | b469e5f933b52906f26d4ecb98db0f07ef0f1a46 /source/blender/render/intern | |
| parent | 5a310fe8e15a3d61dfc86a7a7a765709a6d85478 (diff) | |
| parent | ea134f8411736383183474aa6ee93d63c887c23a (diff) | |
svn merge -r 15973:16060 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 1155d2ea817..c352a83d0f4 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -263,7 +263,12 @@ static void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr) shade_input_set_shade_texco(shi); if(is->mode==RE_RAY_SHADOW_TRA) - shade_color(shi, shr); + if(shi->mat->nodetree && shi->mat->use_nodes) { + ntreeShaderExecTree(shi->mat->nodetree, shi, shr); + shi->mat= vlr->mat; /* shi->mat is being set in nodetree */ + } + else + shade_color(shi, shr); else { if(shi->mat->nodetree && shi->mat->use_nodes) { ntreeShaderExecTree(shi->mat->nodetree, shi, shr); |