From c6a0d0b6f3dd20968f1828d61f096d2189a611ca Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Fri, 27 Jul 2012 05:26:37 +0000 Subject: [PATCH] Fixes build error left out of c1a3b8f171. Refs #1497 This was SVN commit r12205. --- source/collada/PMDConvert.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/source/collada/PMDConvert.cpp b/source/collada/PMDConvert.cpp index 1730f832fe..52f9061518 100644 --- a/source/collada/PMDConvert.cpp +++ b/source/collada/PMDConvert.cpp @@ -159,13 +159,6 @@ public: FCDGeometrySourceList texcoordSources; polys->GetParent()->FindSourcesByType(FUDaeGeometryInput::TEXCOORD, texcoordSources); - - std::vector dataTexcoords; - for (size_t i = 0; i < texcoordSources.size(); ++i) - { - dataTexcoords.push_back(texcoordSources[i]->GetData()); - assert(texcoordSources[i]->GetDataCount() == vertexCount*2); - } float* dataPosition = sourcePosition->GetData(); float* dataNormal = sourceNormal ->GetData(); @@ -173,6 +166,13 @@ public: assert(sourcePosition->GetDataCount() == vertexCount*3); assert(sourceNormal ->GetDataCount() == vertexCount*3); + std::vector dataTexcoords; + for (size_t i = 0; i < texcoordSources.size(); ++i) + { + dataTexcoords.push_back(texcoordSources[i]->GetData()); + assert(texcoordSources[i]->GetDataCount() == vertexCount*2); + } + // Transform mesh coordinate system to game coordinates // (doesn't modify prop points) @@ -433,13 +433,6 @@ public: FCDGeometrySourceList texcoordSources; polys->GetParent()->FindSourcesByType(FUDaeGeometryInput::TEXCOORD, texcoordSources); - - std::vector dataTexcoords; - for (size_t i = 0; i < texcoordSources.size(); ++i) - { - dataTexcoords.push_back(texcoordSources[i]->GetData()); - assert(texcoordSources[i]->GetDataCount() == vertexCount*2); - } float* dataPosition = sourcePosition->GetData(); float* dataNormal = sourceNormal ->GetData(); @@ -447,6 +440,13 @@ public: assert(sourcePosition->GetDataCount() == vertexCount*3); assert(sourceNormal ->GetDataCount() == vertexCount*3); + std::vector dataTexcoords; + for (size_t i = 0; i < texcoordSources.size(); ++i) + { + dataTexcoords.push_back(texcoordSources[i]->GetData()); + assert(texcoordSources[i]->GetDataCount() == vertexCount*2); + } + // Transform model coordinate system to game coordinates TransformSkinnedModel(dataPosition, dataNormal, vertexCount, boneTransforms, propPoints,