Reorder Font members

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

diff --git a/source/font.cpp b/source/font.cpp
index 44e3d241154b0e4acd8ccdd8e747091ea776f9ef..ae2cb289c9980f1d193d3a794ac6f5f2a5d109c6 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <msp/datafile/collection.h>
+#include "bindable.h"
 #include "gl.h"
 #include "font.h"
 #include "immediate.h"
@@ -84,7 +85,7 @@ void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder
        if(!tex)
                throw InvalidState("No texture");
 
-       tex->bind();
+       Bind bind_tex(tex, true);
 
        float x = 0;
        unsigned count = 0;
@@ -139,12 +140,12 @@ Font::Loader::Loader(Font &f, Collection &c):
 
 void Font::Loader::init()
 {
-       add("default_size", &Font::default_size);
-       add("ascent",  &Font::ascent);
-       add("descent", &Font::descent);
-       add("texture", &Font::tex);
+       add("default_size",   &Font::default_size);
+       add("ascent",         &Font::ascent);
+       add("descent",        &Font::descent);
+       add("texture",        &Font::tex);
        add("texture_inline", &Loader::texture_inline);
-       add("glyph",   &Loader::glyph);
+       add("glyph",          &Loader::glyph);
 }
 
 void Font::Loader::glyph(unsigned c)