Style update: add spaces around assignment operators

[libs/gl.git] / source / texunit.cpp

diff --git a/source/texunit.cpp b/source/texunit.cpp
index ba3e7ca6208e3716029027dcdb253b7203221f15..1155fa96286be0ab199280e61ea909115545df30 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -22,8 +22,15 @@ TexUnit::TexUnit():
 
 bool TexUnit::set_texture(const Texture *tex)
 {
-       bool result=(tex!=texture);
-       texture=tex;
+       bool result = (tex!=texture);
+       texture = tex;
+       return result;
+}
+
+bool TexUnit::set_texenv(const TexEnv *env)
+{
+       bool result = (texenv!=env);
+       texenv = env;
        return result;
 }
 
@@ -34,10 +41,10 @@ TexUnit &TexUnit::activate(unsigned n)
 
        if(cur_unit!=&units[n] && (cur_unit || n))
        {
-               require_version(1, 3);
+               static RequireVersion _ver(1, 3);
                glActiveTexture(GL_TEXTURE0+n);
        }
-       cur_unit=&units[n];
+       cur_unit = &units[n];
 
        return units[n];
 }
@@ -50,7 +57,7 @@ TexUnit &TexUnit::current()
 }
 
 vector<TexUnit> TexUnit::units;
-TexUnit *TexUnit::cur_unit=0;
+TexUnit *TexUnit::cur_unit = 0;
 
 } // namespace GL
 } // namespace Msp