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>2013-04-18 05:52:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-18 05:52:38 +0400
commit3f7f07faf51c16f11e5eefeddb537b2e1b024f58 (patch)
treec33a03d05bf774ea363d355694432a400487ec10 /source/gameengine
parent9cceec40c47543eb372bd9c1331901857b5f120a (diff)
style cleanup
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_ActionActuator.h6
-rw-r--r--source/gameengine/Expressions/InputParser.cpp2
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp6
-rw-r--r--source/gameengine/VideoTexture/Texture.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 46075ea933d..ce805c774ef 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -61,9 +61,9 @@ public:
virtual CValue* GetReplica();
virtual void ProcessReplica();
- void SetBlendTime (float newtime);
- void SetLocalTime (float curtime);
- void ResetStartTime (float curtime);
+ void SetBlendTime(float newtime);
+ void SetLocalTime(float curtime);
+ void ResetStartTime(float curtime);
bAction* GetAction() { return m_action; }
void SetAction(bAction* act) { m_action= act; }
diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp
index ed89fb13337..4ba3585455b 100644
--- a/source/gameengine/Expressions/InputParser.cpp
+++ b/source/gameengine/Expressions/InputParser.cpp
@@ -542,7 +542,7 @@ CExpression *CParser::Ex(int i)
errmsg=NULL;
} else {
// does this happen ?
- MT_assert ("does this happen");
+ MT_assert("does this happen");
}
}
e1 = Error(errtext);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index e90f7573ab1..a8d03f9f337 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -328,13 +328,13 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
// Blender camera routine destroys the settings
if (m_drawingmode < KX_SOLID)
{
- glDisable (GL_CULL_FACE);
- glDisable (GL_DEPTH_TEST);
+ glDisable(GL_CULL_FACE);
+ glDisable(GL_DEPTH_TEST);
}
else
{
glEnable(GL_DEPTH_TEST);
- glEnable (GL_CULL_FACE);
+ glEnable(GL_CULL_FACE);
}
glDisable(GL_BLEND);
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index aebc2aeef01..1efbc50bfe0 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -381,7 +381,7 @@ static PyObject *Texture_refresh(Texture *self, PyObject *args)
texture = self->m_scaledImg;
}
// load texture for rendering
- loadTexture (self->m_actTex, texture, size, self->m_mipmap);
+ loadTexture(self->m_actTex, texture, size, self->m_mipmap);
// refresh texture source, if required
if (refreshSource) self->m_source->m_image->refresh();