diff options
author | Ton Roosendaal <ton@blender.org> | 2011-02-21 21:06:52 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-02-21 21:06:52 +0300 |
commit | 33887fa41dcc010a8543e8bc78d1b2de23fcd099 (patch) | |
tree | 7d00a6e68b29dbbeecfafed491d6e011e6681721 /source/blender/blenkernel/intern/material.c | |
parent | 3459c1b26cae80429046df7f84f8752eb13fd339 (diff) |
Bugfix #26116
Node materials with 'ray transparency' set now work again.
Fix provided by Ervin Weber, thanks a lot!
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 954de9c86e2..0b1cbd60432 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -872,7 +872,7 @@ static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode if(ma!=basemat) { do_init_render_material(ma, r_mode, amb); basemat->texco |= ma->texco; - basemat->mode_l |= ma->mode_l; + basemat->mode_l |= ma->mode_l & ~(MA_TRANSP|MA_ZTRANSP|MA_RAYTRANSP); } } else if(node->type==NODE_GROUP) |