Revision: 15938
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15938
Author:   blendix
Date:     2008-08-03 18:02:56 +0200 (Sun, 03 Aug 2008)

Log Message:
-----------
apricot branch: fix a bug with the export of the second uv layer
to the game engine for GLSL.

Modified Paths:
--------------
    branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Modified: 
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp   
2008-08-03 15:57:09 UTC (rev 15937)
+++ branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp   
2008-08-03 16:02:56 UTC (rev 15938)
@@ -644,6 +644,7 @@
                for (int vind = 0; vind<material->num_enabled; vind++)
                {
                        BL_Mapping &map = material->mapping[vind];
+
                        if (map.uvCoName.IsEmpty())
                                isFirstSet = false;
                        else
@@ -673,7 +674,7 @@
                                                        isFirstSet = false;
                                                        uvName = layer.name;
                                                }
-                                               else
+                                               else if(strcmp(layer.name, 
uvName) != 0)
                                                {
                                                        uv2[0] = uvSet[0]; 
uv2[1] = uvSet[1];
                                                        uv2[2] = uvSet[2]; 
uv2[3] = uvSet[3];


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to