Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12751251 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am d8f7a0e3: Merge change I7299c83b into eclair 

Merge commit 'd8f7a0e3' into eclair-mr2

* commit 'd8f7a0e3':
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
parents 93942a5b d8f7a0e3

graphics/java/android/renderscript/SimpleMesh.java

+5 −5
Original line number Diff line number Diff line
@@ -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) {