From 08e81c93d113762e1a6e8cf04fe37a9c9ac461e4 Mon Sep 17 00:00:00 2001
From: jeunathe <jeunathe@gmail.com>
Date: Wed, 9 Jan 2013 16:33:09 +0000
Subject: [PATCH] coding style my ass
---
src/easymesh/easymesh.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/easymesh/easymesh.cpp b/src/easymesh/easymesh.cpp
index fee31b02..f459c017 100644
--- a/src/easymesh/easymesh.cpp
+++ b/src/easymesh/easymesh.cpp
@@ -62,13 +62,15 @@ void EasyMesh::CloseBrace()
m_cursors.Pop();
}
-void EasyMesh::MeshConvert(Shader* ProvidedShader)
+void EasyMesh::MeshConvert(Shader* provided_shader)
{
- if(ProvidedShader == NULL)
+ if(provided_shader == NULL)
{
m_gpu.shader = Shader::Create(lolfx_shiny);
- }else{
- m_gpu.shader = ProvidedShader;
+ }
+ else
+ {
+ m_gpu.shader = provided_shader;
}
m_gpu.modelview = m_gpu.shader->GetUniformLocation("in_ModelView");