Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-28 09:03:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-28 09:03:24 +0400
commit07065b27b8b37316004f40896f436d26e066f25f (patch)
tree19713fa864612e094f21a881e9816a8e1bf42b7b /source/gameengine/Ketsji/BL_Texture.cpp
parentc9f677d24d9600d9ba07f1b258c49455bc348554 (diff)
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_Texture.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index 4aab091c6a1..576da0d3f40 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -474,7 +474,7 @@ void BL_Texture::SetMapping(int mode)
void BL_Texture::setTexEnv(BL_Material *mat, bool modulate)
{
- if (modulate || !GLEW_ARB_texture_env_combine){
+ if (modulate || !GLEW_ARB_texture_env_combine) {
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
return;
}
@@ -528,11 +528,11 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate)
}
bool using_alpha = false;
- if (mat->flag[mUnit] &USEALPHA){
+ if (mat->flag[mUnit] &USEALPHA) {
alphaOp = GL_ONE_MINUS_SRC_ALPHA;
using_alpha=true;
}
- else if (mat->flag[mUnit] &USENEGALPHA){
+ else if (mat->flag[mUnit] &USENEGALPHA) {
alphaOp = GL_SRC_ALPHA;
using_alpha = true;
}