diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-05 17:51:07 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-05 17:51:07 +0400 |
| commit | cf0e6464322bbdf6ae8b41f1dffc3e3704fad541 (patch) | |
| tree | 55833f59294434a21c0450d7c64200da3b4d72cf /source/gameengine/Converter | |
| parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) | |
Remove usage of deprecated TEX_USEALPHA from GE code
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index a4c4253754e..9267b2b9fed 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -650,11 +650,10 @@ static bool ConvertMaterial( material->texname[i] = material->img[i]->id.name; material->flag[i] |= ( mttmp->tex->imaflag &TEX_MIPMAP )?MIPMAP:0; // ----------------------- - if ( mttmp->tex->imaflag &TEX_USEALPHA ) { + if (material->img[i] && (material->img[i]->flag & IMA_IGNORE_ALPHA) == 0) material->flag[i] |= USEALPHA; - } // ----------------------- - else if ( mttmp->tex->imaflag &TEX_CALCALPHA ) { + if ( mttmp->tex->imaflag &TEX_CALCALPHA ) { material->flag[i] |= CALCALPHA; } else if (mttmp->tex->flag &TEX_NEGALPHA) { |