From aabf720376e957eadc3f40464e25a2b0786049bb Mon Sep 17 00:00:00 2001 From: "Asad M. Zaman" Date: Fri, 9 Dec 2005 00:02:32 +0000 Subject: [PATCH] changing the rule for mayatoegg modulate mode on multitexture --- pandatool/src/mayaegg/mayaToEggConverter.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pandatool/src/mayaegg/mayaToEggConverter.cxx b/pandatool/src/mayaegg/mayaToEggConverter.cxx index 00bbc60c7f..c2d42dffc7 100644 --- a/pandatool/src/mayaegg/mayaToEggConverter.cxx +++ b/pandatool/src/mayaegg/mayaToEggConverter.cxx @@ -2332,11 +2332,16 @@ set_shader_attributes(EggPrimitive &primitive, const MayaShader &shader, if (i!=shader._color.size()-1) { // read the _alpha_is_luminance to figure out env_type tex.set_env_type((EggTexture::EnvType)color_def->_blend_type); - // multitexture modulate mode may specify, desired alpha on/off + // multitexture modulate mode should always turn alpha + // off. The texture and textures.txa will determine + // whether to keep it or not + if (tex.get_env_type() == EggTexture::ET_modulate) { + tex.set_alpha_mode(EggRenderMode::AM_off); // Force alpha to be 'off' + } + /* if (!color_def->_alpha_is_luminance) tex.set_alpha_mode(EggRenderMode::AM_off); // Force alpha to be 'off' - } - if (color_def->_alpha_is_luminance) { + */ } } } else { // trans_def._has_texture