diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
| commit | 2fb82920059257fd7ac8e33bfe53de13e7ed53bd (patch) | |
| tree | cb8de3a839cb9878d0869d4e436a235346109c16 /source/gameengine/Ketsji/BL_Texture.cpp | |
| parent | c2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (diff) | |
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index b8cc4ebeff9..7196c1ec664 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -47,7 +47,7 @@ static int power_of_2_min_i(int num) { while (!is_power_of_2_i(num)) num= num&(num-1); - return num; + return num; } // Place holder for a full texture manager @@ -427,7 +427,7 @@ void BL_Texture::DisableAllTextures() glMatrixMode(GL_TEXTURE); glLoadIdentity(); glMatrixMode(GL_MODELVIEW); - glDisable(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); @@ -447,14 +447,14 @@ void BL_Texture::ActivateTexture() if (mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map) { - glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture ); + glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture ); glEnable(GL_TEXTURE_CUBE_MAP_ARB); } else { if (GLEW_ARB_texture_cube_map ) glDisable(GL_TEXTURE_CUBE_MAP_ARB); - glBindTexture( GL_TEXTURE_2D, mTexture ); + glBindTexture( GL_TEXTURE_2D, mTexture ); glEnable(GL_TEXTURE_2D); } } @@ -659,7 +659,7 @@ void my_envmap_split_ima(EnvMap *env, ImBuf *ibuf) { int dx, part; - my_free_envmapdata(env); + my_free_envmapdata(env); dx= ibuf->y; dx/= 2; |