diff options
author | Wei Huang <weih@google.com> | 2012-06-18 23:15:18 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-18 23:15:18 -0700 |
commit | d937a2e931f222d2e60d9da007df4647b975eb7f (patch) | |
tree | befce6484ed1e1d881bd0491af45cc516324ada6 /src/com/android/gallery3d/ui | |
parent | c66604cb29e0402ecbeb37ab79d9db0851fce3ec (diff) | |
parent | 1cbde8f63a4862e814078da9b7cefce0c6291dab (diff) | |
download | android_packages_apps_Gallery2-d937a2e931f222d2e60d9da007df4647b975eb7f.tar.gz android_packages_apps_Gallery2-d937a2e931f222d2e60d9da007df4647b975eb7f.tar.bz2 android_packages_apps_Gallery2-d937a2e931f222d2e60d9da007df4647b975eb7f.zip |
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
Diffstat (limited to 'src/com/android/gallery3d/ui')
-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; |