[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54785] trunk/blender/source/gameengine: code cleanup: confusingly written and named function for BGE materuial conversion: getImageFromMaterial() --> getMTexFromMaterial()
Campbell Barton
ideasman42 at gmail.com
Sat Feb 23 08:36:40 CET 2013
Revision: 54785
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54785
Author: campbellbarton
Date: 2013-02-23 07:36:40 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
code cleanup: confusingly written and named function for BGE materuial conversion: getImageFromMaterial() --> getMTexFromMaterial()
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
trunk/blender/source/gameengine/Ketsji/BL_Material.h
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2013-02-23 07:15:37 UTC (rev 54784)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2013-02-23 07:36:40 UTC (rev 54785)
@@ -613,11 +613,11 @@
material->flag[i] |= ( mat->game.alpha_blend & GEMAT_ALPHA )?USEALPHA:0;
material->flag[i] |= ( mat->game.alpha_blend & GEMAT_ADD )?CALCALPHA:0;
- if (material->img[i]->flag & IMA_REFLECT)
+ if (material->img[i]->flag & IMA_REFLECT) {
material->mapping[i].mapping |= USEREFL;
- else
- {
- mttmp = getImageFromMaterial( mat, i );
+ }
+ else {
+ mttmp = getMTexFromMaterial(mat, i);
if (mttmp && (mttmp->texco & TEXCO_UV)) {
/* string may be "" but thats detected as empty after */
material->mapping[i].uvCoName = mttmp->uvname;
@@ -634,9 +634,9 @@
continue;
}
- mttmp = getImageFromMaterial( mat, i );
- if ( mttmp ) {
- if ( mttmp->tex ) {
+ mttmp = getMTexFromMaterial(mat, i);
+ if (mttmp) {
+ if (mttmp->tex) {
if ( mttmp->tex->type == TEX_IMAGE ) {
material->mtexname[i] = mttmp->tex->id.name;
material->img[i] = mttmp->tex->ima;
Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2013-02-23 07:15:37 UTC (rev 54784)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2013-02-23 07:36:40 UTC (rev 54785)
@@ -10,14 +10,14 @@
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
-MTex* getImageFromMaterial(Material *mat, int index)
+MTex* getMTexFromMaterial(Material *mat, int index)
{
- if (!mat) return 0;
-
- if (!(index >=0 && index < MAX_MTEX) ) return 0;
-
- MTex *m = mat->mtex[index];
- return m?m:0;
+ if (mat && (index >= 0) && (index < MAX_MTEX)) {
+ return mat->mtex[index];
+ }
+ else {
+ return NULL;
+ }
}
BL_Material::BL_Material()
Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.h 2013-02-23 07:15:37 UTC (rev 54784)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.h 2013-02-23 07:36:40 UTC (rev 54785)
@@ -174,7 +174,7 @@
// ------------------------------------
//extern void initBL_Material(BL_Material* mat);
-extern MTex* getImageFromMaterial(Material *mat, int index);
+extern MTex* getMTexFromMaterial(Material *mat, int index);
// ------------------------------------
#endif
More information about the Bf-blender-cvs
mailing list