summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2012-06-18 23:15:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-18 23:15:18 -0700
commit7802aba4f3ea92df65f7cf8b7de2d61d87b75034 (patch)
tree0e4f7371a389fc82358038b3aa7df420aed438a9 /src
parent8d84cc6d45b956b3ed52ba2a1c5ea49105f047cc (diff)
parenta3a225f1f6afe0fb6a8af4fc1a81a8a1a227946d (diff)
downloadandroid_packages_apps_Snap-7802aba4f3ea92df65f7cf8b7de2d61d87b75034.tar.gz
android_packages_apps_Snap-7802aba4f3ea92df65f7cf8b7de2d61d87b75034.tar.bz2
android_packages_apps_Snap-7802aba4f3ea92df65f7cf8b7de2d61d87b75034.zip
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/GLCanvasImpl.java2
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;