diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 11:15:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-23 11:15:37 +0400 |
| commit | dddee08f27dd98c8638e911779d48bc14568bada (patch) | |
| tree | 6f19e628c1958985cefaf9f2a425ba9e30f1d994 /source/gameengine/Converter | |
| parent | 375c0144c89a386d732868fd679005551f9fec98 (diff) | |
code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective).
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index a4c7e8b0fa7..07f37d5a6e2 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -618,14 +618,9 @@ static bool ConvertMaterial( else { mttmp = getImageFromMaterial( mat, i ); - if (mttmp && mttmp->texco &TEXCO_UV) - { - STR_String uvName = mttmp->uvname; - - if (!uvName.IsEmpty()) - material->mapping[i].uvCoName = mttmp->uvname; - else - material->mapping[i].uvCoName = ""; + if (mttmp && (mttmp->texco & TEXCO_UV)) { + /* string may be "" but thats detected as empty after */ + material->mapping[i].uvCoName = mttmp->uvname; } material->mapping[i].mapping |= USEUV; } @@ -706,14 +701,9 @@ static bool ConvertMaterial( material->mapping[i].mapping |= USEREFL; else if (mttmp->texco &(TEXCO_ORCO|TEXCO_GLOB)) material->mapping[i].mapping |= USEORCO; - else if (mttmp->texco &TEXCO_UV) - { - STR_String uvName = mttmp->uvname; - - if (!uvName.IsEmpty()) - material->mapping[i].uvCoName = mttmp->uvname; - else - material->mapping[i].uvCoName = ""; + else if (mttmp->texco & TEXCO_UV) { + /* string may be "" but thats detected as empty after */ + material->mapping[i].uvCoName = mttmp->uvname; material->mapping[i].mapping |= USEUV; } else if (mttmp->texco &TEXCO_NORM) |