diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-04-10 14:14:26 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-04-10 14:14:26 +0400 |
| commit | 3be0c804aed1af822f54ca7a119e95e2aa4ef187 (patch) | |
| tree | beaab8564251d74f880999b9117ae6a449c99482 | |
| parent | b2b1b7c90b0c9c22095b82fbc9e7f9344283c3bf (diff) | |
Bugfix #3725
When you disable a texture channel using Displacement in a Material, the
initialize code and renderconvert code still though this was active.
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 03e9f7d4a6c..c3d35eb1d52 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -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) { |