Bugfix #3725
authorTon Roosendaal <ton@blender.org>
Mon, 10 Apr 2006 10:14:26 +0000 (10:14 +0000)
committerTon Roosendaal <ton@blender.org>
Mon, 10 Apr 2006 10:14:26 +0000 (10:14 +0000)
When you disable a texture channel using Displacement in a Material, the
initialize code and renderconvert code still though this was active.

source/blender/blenkernel/intern/material.c

index 03e9f7d4a6c926547e43fd9866ed02d421516089..c3d35eb1d528ebf1c9a71eec4a6d633f13b00cec 100644 (file)
@@ -574,6 +574,10 @@ static void do_init_render_material(Material *ma, int osa, float *amb)
        ma->texco= 0;
        ma->mapto= 0;
        for(a=0; a<MAX_MTEX; a++) {
+               
+               /* separate tex switching */
+               if(ma->septex & (1<<a)) continue;
+
                mtex= ma->mtex[a];
                if(mtex && mtex->tex) {