am d8f7a0e3: Merge change I7299c83b into eclair

Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-mr2

* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
This commit is contained in:
Jason Sams
2009-10-16 15:17:25 -07:00
committed by Android Git Automerger

View File

@@ -228,17 +228,17 @@ public class SimpleMesh extends BaseObj {
mVtxData[mVtxCount++] = mB;
mVtxData[mVtxCount++] = mA;
}
if ((mFlags & TEXTURE_0) != 0) {
makeSpace(2);
mVtxData[mVtxCount++] = mS0;
mVtxData[mVtxCount++] = mT0;
}
if ((mFlags & NORMAL) != 0) {
makeSpace(3);
mVtxData[mVtxCount++] = mNX;
mVtxData[mVtxCount++] = mNY;
mVtxData[mVtxCount++] = mNZ;
}
if ((mFlags & TEXTURE_0) != 0) {
makeSpace(2);
mVtxData[mVtxCount++] = mS0;
mVtxData[mVtxCount++] = mT0;
}
}
public void addVertex(float x, float y) {