sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE: Fix for bugs #34428, #20856, #20281. These were all multi-uv bugs caused by the BGE keeping too much uv information. When setting up shaders the BGE assumes each UV layer is unique, but the converter would store duplicates.

Browse Source
This commit is contained in:
Mitchell Stokes 2013-03-02 18:05:52 +00:00
parent c718f0d658
commit db6d34daad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -35,6 +35,8 @@
#endif
#include <math.h>
#include <vector>
#include <algorithm>
#include "BL_BlenderDataConversion.h"
#include "KX_BlenderGL.h"
@ -506,12 +508,17 @@ static void GetUVs(BL_Material *material, MTF_localLayer *layers, MFace *mface,
uvs[0][0] = uvs[1][0] = uvs[2][0] = uvs[3][0] = MT_Point2(0.f, 0.f);
}
vector<STR_String> found_layers;
for (int vind = 0; vind<MAXTEX; vind++)
{
BL_Mapping &map = material->mapping[vind];
if (!(map.mapping & USEUV)) continue;
if (std::find(found_layers.begin(), found_layers.end(), map.uvCoName) != found_layers.end())
continue;
//If no UVSet is specified, try grabbing one from the UV/Image editor
if (map.uvCoName.IsEmpty() && tface)
{
@ -544,6 +551,7 @@ static void GetUVs(BL_Material *material, MTF_localLayer *layers, MFace *mface,
uvs[3][unit].setValue(0.0f, 0.0f);
++unit;
found_layers.push_back(map.uvCoName);
break;
}
}