RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whoops, wrong logic for picking default TextureStages

This commit is contained in:
David Rose 2004-07-30 23:27:17 +00:00
parent 0764556c80
commit e3573f97df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/egg2pg/eggLoader.cxx
View File

@ -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 &&