commit 3b3c1d43debed9956394afd156efe26cc62312ae
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Jun 08 20:38:09 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Jun 08 20:38:09 2011 +0000
tree 867b19aeba1cd7f6ea1c709d849a47aa2007c842
parent 82e7e9d0a9e93f9ff7c14580fa4e0db6e8673897

Revert copyImage changes from r682 as they cause regressions on some webpages

git-svn-id: https://angleproject.googlecode.com/svn/trunk@684 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index c2de131..93aa20f 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 683
+#define BUILD_REVISION 684
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index c87f652..bb4c4b8 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1488,6 +1488,8 @@
         {
             convertToRenderTarget();
         }
+        
+        updateTexture();
 
         if (width != 0 && height != 0 && level < levelCount())
         {
@@ -2354,6 +2356,8 @@
         {
             convertToRenderTarget();
         }
+        
+        updateTexture();
 
         ASSERT(width == height);