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_Shader.cpp
parentc9f677d24d9600d9ba07f1b258c49455bc348554 (diff)
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji/BL_Shader.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_Shader.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 55045f9f169..98854115d0a 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -136,7 +136,7 @@ BL_Shader::BL_Shader()
BL_Shader::~BL_Shader()
{
- //for (int i=0; i<MAXTEX; i++){
+ //for (int i=0; i<MAXTEX; i++) {
// if (mSampler[i].mOwn) {
// if (mSampler[i].mTexture)
// mSampler[i].mTexture->DeleteTex();
@@ -157,7 +157,7 @@ BL_Shader::~BL_Shader()
void BL_Shader::ClearUniforms()
{
BL_UniformVec::iterator it = mUniforms.begin();
- while(it != mUniforms.end()){
+ while(it != mUniforms.end()) {
delete (*it);
it++;
}
@@ -255,7 +255,7 @@ bool BL_Shader::LinkProgram()
if (mError)
goto programError;
- if (!vertProg || !fragProg){
+ if (!vertProg || !fragProg) {
spit("Invalid GLSL sources");
return false;
}
@@ -275,7 +275,7 @@ bool BL_Shader::LinkProgram()
glGetObjectParameterivARB(tmpVert, GL_OBJECT_INFO_LOG_LENGTH_ARB,(GLint*) &vertlen);
// print info if any
- if ( vertlen > 0 && vertlen < MAX_LOG_LEN){
+ if ( vertlen > 0 && vertlen < MAX_LOG_LEN) {
logInf = (char*)MEM_mallocN(vertlen, "vert-log");
glGetInfoLogARB(tmpVert, vertlen, (GLsizei*)&char_len, logInf);
if (char_len >0) {
@@ -297,7 +297,7 @@ bool BL_Shader::LinkProgram()
glShaderSourceARB(tmpFrag, 1,(const char**)&fragProg, 0);
glCompileShaderARB(tmpFrag);
glGetObjectParameterivARB(tmpFrag, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &fraglen);
- if (fraglen >0 && fraglen < MAX_LOG_LEN){
+ if (fraglen >0 && fraglen < MAX_LOG_LEN) {
logInf = (char*)MEM_mallocN(fraglen, "frag-log");
glGetInfoLogARB(tmpFrag, fraglen,(GLsizei*) &char_len, logInf);
if (char_len >0) {
@@ -309,7 +309,7 @@ bool BL_Shader::LinkProgram()
}
glGetObjectParameterivARB(tmpFrag, GL_OBJECT_COMPILE_STATUS_ARB, (GLint*) &fragstatus);
- if (!fragstatus){
+ if (!fragstatus) {
spit("---- Fragment shader failed to compile ----");
goto programError;
}
@@ -336,7 +336,7 @@ bool BL_Shader::LinkProgram()
logInf=0;
}
- if (!progstatus){
+ if (!progstatus) {
spit("---- GLSL program failed to link ----");
goto programError;
}
@@ -895,7 +895,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" )
#else
SetUniform(loc, index);
#endif
- //if(index <= MAXTEX)
+ //if (index <= MAXTEX)
// mSampler[index].mLoc = loc;
//else
// spit("Invalid texture sample index: " << index);