From e3573f97df366e7af76de01f92cee69292a6ccb8 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 30 Jul 2004 23:27:17 +0000 Subject: [PATCH] whoops, wrong logic for picking default TextureStages --- panda/src/egg2pg/eggLoader.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx index 43eceaa1f8..a6cb533679 100644 --- a/panda/src/egg2pg/eggLoader.cxx +++ b/panda/src/egg2pg/eggLoader.cxx @@ -1139,8 +1139,8 @@ make_texture_stage(const EggTexture *egg_tex) { if (!egg_tex->has_stage_name() && !egg_tex->has_uv_name() && !egg_tex->has_color() && - egg_tex->get_env_type() == EggTexture::ET_unspecified && - egg_tex->get_env_type() == EggTexture::ET_modulate && + (egg_tex->get_env_type() == EggTexture::ET_unspecified || + egg_tex->get_env_type() == EggTexture::ET_modulate) && egg_tex->get_combine_mode(EggTexture::CC_rgb) == EggTexture::CM_unspecified && egg_tex->get_combine_mode(EggTexture::CC_alpha) == EggTexture::CM_unspecified &&