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 | 078be806c9caa4c750e17d44851e075e8cf09ef2 (patch) | |
| tree | 0d2a0f6f7f0c2203a12d6f1f904a6916239a3d89 /src/com | |
| parent | 90e71542d1307a3b142509ee658304920d1b3f3d (diff) | |
| parent | d937a2e931f222d2e60d9da007df4647b975eb7f (diff) | |
| download | android_packages_apps_Gallery2-078be806c9caa4c750e17d44851e075e8cf09ef2.tar.gz android_packages_apps_Gallery2-078be806c9caa4c750e17d44851e075e8cf09ef2.tar.bz2 android_packages_apps_Gallery2-078be806c9caa4c750e17d44851e075e8cf09ef2.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/com')
| -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; |