[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53585] trunk/blender/source/gameengine/ Converter/BL_BlenderDataConversion.cpp: Remove usage of deprecated TEX_USEALPHA from GE code
Sergey Sharybin
sergey.vfx at gmail.com
Sat Jan 5 14:51:11 CET 2013
Revision: 53585
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53585
Author: nazgul
Date: 2013-01-05 13:51:07 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Remove usage of deprecated TEX_USEALPHA from GE code
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2013-01-05 12:27:54 UTC (rev 53584)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2013-01-05 13:51:07 UTC (rev 53585)
@@ -650,11 +650,10 @@
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) {
More information about the Bf-blender-cvs
mailing list