Merged changes in the trunk up to revision 35203.
[blender.git] / source / blender / blenkernel / intern / material.c
index cd52a38140a62743c1cb8a52c557b0e3f76b25a0..f56c72669e861ec6cc4b949e1f86539ee3852a4b 100644 (file)
@@ -873,7 +873,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)