diff options
| author | Wei Huang <weih@google.com> | 2012-06-18 23:19:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 23:19:48 -0700 |
| commit | 9e168b172b45ed795f1751146954edef3cb8b2dd (patch) | |
| tree | b637cd093c50e8c14783bf547b6de1a66cdf423a | |
| parent | 46d51c68b2b1a90e638d2135e204dc51768d5628 (diff) | |
| parent | 078be806c9caa4c750e17d44851e075e8cf09ef2 (diff) | |
| download | android_packages_apps_Gallery2-9e168b172b45ed795f1751146954edef3cb8b2dd.tar.gz android_packages_apps_Gallery2-9e168b172b45ed795f1751146954edef3cb8b2dd.tar.bz2 android_packages_apps_Gallery2-9e168b172b45ed795f1751146954edef3cb8b2dd.zip | |
am 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
* commit '078be806c9caa4c750e17d44851e075e8cf09ef2':
Fix Gallery glitch due to ColorTexture.
| -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; |