diff options
| author | Wei Huang <weih@google.com> | 2012-06-18 23:17:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 23:17:17 -0700 |
| commit | b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969 (patch) | |
| tree | 1a7663079e3ea763325e779833a447b801074d12 /src | |
| parent | 3772856152d4e404f4f9486d6026adb9fc66bf76 (diff) | |
| parent | 7802aba4f3ea92df65f7cf8b7de2d61d87b75034 (diff) | |
| download | android_packages_apps_Snap-b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969.tar.gz android_packages_apps_Snap-b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969.tar.bz2 android_packages_apps_Snap-b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969.zip | |
am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
* commit 'd937a2e931f222d2e60d9da007df4647b975eb7f':
Fix Gallery glitch due to ColorTexture.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/GLCanvasImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/GLCanvasImpl.java b/src/com/android/gallery3d/ui/GLCanvasImpl.java index ff3e9e574..45ea0584f 100644 --- a/src/com/android/gallery3d/ui/GLCanvasImpl.java +++ b/src/com/android/gallery3d/ui/GLCanvasImpl.java @@ -529,7 +529,7 @@ public class GLCanvasImpl implements GLCanvas { private int mTexEnvMode = GL11.GL_REPLACE; private float mTextureAlpha = 1.0f; - private int mTextureTarget = 0; + private int mTextureTarget = GL11.GL_TEXTURE_2D; private boolean mBlendEnabled = true; private float mLineWidth = 1.0f; private boolean mLineSmooth = false; |