diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-18 22:33:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 22:33:16 +0000 |
| commit | 4f0a96d2d923bd1f4c7f46ec25c83711565b77db (patch) | |
| tree | f60094e0fad93d0208801d0a2ff8cffc102cb3bc | |
| parent | 1eca7d66ee3da87c622259544794b8fe998cdb92 (diff) | |
| parent | 9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e (diff) | |
| download | frameworks_base-4f0a96d2d923bd1f4c7f46ec25c83711565b77db.zip frameworks_base-4f0a96d2d923bd1f4c7f46ec25c83711565b77db.tar.gz frameworks_base-4f0a96d2d923bd1f4c7f46ec25c83711565b77db.tar.bz2 | |
am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
* commit '9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
Frameworks/base: Remove duplicate check in Mesh
| -rw-r--r-- | rs/java/android/renderscript/Mesh.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 1a5dc9e..5b4cadb 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -811,9 +811,7 @@ public class Mesh extends BaseObj { sm.getVertexAllocation(0).copy1DRangeFromUnchecked(0, mMaxIndex, mVtxData); if(uploadToBufferObject) { - if (uploadToBufferObject) { - sm.getVertexAllocation(0).syncAll(Allocation.USAGE_SCRIPT); - } + sm.getVertexAllocation(0).syncAll(Allocation.USAGE_SCRIPT); } sm.getIndexSetAllocation(0).copy1DRangeFromUnchecked(0, mIndexCount, mIndexData); |