am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"

* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
  Fixed to draw texture when loadTexture() is called at first time
This commit is contained in:
Conley Owens 2011-04-29 17:15:35 -07:00 committed by Android Git Automerger
commit 7badf9c5e8

View File

@ -186,7 +186,7 @@ status_t TextureManager::loadTexture(Texture* texture,
if (texture->name == -1UL) {
status_t err = initTexture(texture);
LOGE_IF(err, "loadTexture failed in initTexture (%s)", strerror(err));
return err;
if (err != NO_ERROR) return err;
}
if (texture->target != Texture::TEXTURE_2D)