diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 11:36:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 11:36:40 +0400 |
commit | 166de48ca4c7a035723be50c10568ff0e2e7ed84 (patch) | |
tree | d77fee5709fea93966629fbe0143a98a579cebed /source/gameengine/Ketsji | |
parent | dddee08f27dd98c8638e911779d48bc14568bada (diff) |
code cleanup: confusingly written and named function for BGE materuial conversion: getImageFromMaterial() --> getMTexFromMaterial()
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/BL_Material.cpp | 14 | ||||
-rw-r--r-- | source/gameengine/Ketsji/BL_Material.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp index 461a8c51a52..393d00223e0 100644 --- a/source/gameengine/Ketsji/BL_Material.cpp +++ b/source/gameengine/Ketsji/BL_Material.cpp @@ -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() diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h index 0383c0891b6..be66e2ec84d 100644 --- a/source/gameengine/Ketsji/BL_Material.h +++ b/source/gameengine/Ketsji/BL_Material.h @@ -174,7 +174,7 @@ enum BL_MappingProj // ------------------------------------ //extern void initBL_Material(BL_Material* mat); -extern MTex* getImageFromMaterial(Material *mat, int index); +extern MTex* getMTexFromMaterial(Material *mat, int index); // ------------------------------------ #endif |