[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54784] trunk/blender/source/gameengine/ Converter/BL_BlenderDataConversion.cpp: code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective).

Campbell Barton ideasman42 at gmail.com
Sat Feb 23 08:15:37 CET 2013


Revision: 54784
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54784
Author:   campbellbarton
Date:     2013-02-23 07:15:37 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective).

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-02-23 06:56:10 UTC (rev 54783)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-02-23 07:15:37 UTC (rev 54784)
@@ -618,14 +618,9 @@
 					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 @@
 							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)




More information about the Bf-blender-cvs mailing list