From dddee08f27dd98c8638e911779d48bc14568bada Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Feb 2013 07:15:37 +0000 Subject: code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective). --- .../Converter/BL_BlenderDataConversion.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'source/gameengine/Converter') 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) -- cgit v1.2.3