Bladeren bron

Merge pull request #1498 from seanpaultaylor/next

Changed std::addressof to cast. Fixes compiler error on BB10
Sean Taylor 11 jaren geleden
bovenliggende
commit
f08fd7d9c4
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      gameplay/src/Texture.cpp

+ 1 - 1
gameplay/src/Texture.cpp

@@ -854,7 +854,7 @@ void Texture::generateMipmaps()
     {
     {
         GL_ASSERT( glBindTexture(GL_TEXTURE_2D, _handle) );
         GL_ASSERT( glBindTexture(GL_TEXTURE_2D, _handle) );
         GL_ASSERT( glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST) );
         GL_ASSERT( glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST) );
-        if (std::addressof(glGenerateMipmap))
+        if (glGenerateMipmap)
             GL_ASSERT( glGenerateMipmap(GL_TEXTURE_2D) );
             GL_ASSERT( glGenerateMipmap(GL_TEXTURE_2D) );
 
 
         _mipmapped = true;
         _mipmapped = true;