no log

src/Renderer/SkinsDeformer.cpp

@@ -41,13 +41,13 @@ void SkinsDeformer::deform(SkinPatchNode& node)
 		sProg = tfHwSkinningPosSProg.get();
 	}
 
-	tfHwSkinningAllSProg->bind();
+	sProg->bind();
 
 	// Uniforms
-	tfHwSkinningAllSProg->findUniVar("skinningRotations")->set(&skinNode->getBoneRotations()[0],
+	sProg->findUniVar("skinningRotations")->set(&skinNode->getBoneRotations()[0],
 	                                                           skinNode->getBoneRotations().size());
 
-	tfHwSkinningAllSProg->findUniVar("skinningTranslations")->set(&skinNode->getBoneTranslations()[0],
+	sProg->findUniVar("skinningTranslations")->set(&skinNode->getBoneTranslations()[0],
 	                                                              skinNode->getBoneTranslations().size());
 
 	node.getTfVao().bind();

src/Ui/UiFont.h

@@ -0,0 +1,25 @@
+#ifndef UI_FONT_H
+#define UI_FONT_H
+
+#include <memory>
+#include "Texture.h"
+
+
+namespace Ui {
+
+
+/// @todo
+class Font
+{
+	public:
+		Font(const char* fontFilename, uint nominalWidth, uintNominalHeight);
+
+	private:
+		std::auto_ptr<Texture> map;
+};
+
+
+} // end namespace
+
+
+#endif

src/Util/Scanner/ScannerToken.cpp

@@ -17,16 +17,16 @@ Token::Token(const Token& b):
 {
 	switch(b.dataType)
 	{
-		case Scanner::DT_FLOAT:
+		case DT_FLOAT:
 			value.float_ = b.value.float_;
 			break;
-		case Scanner::DT_INT:
+		case DT_INT:
 			value.int_ = b.value.int_;
 			break;
-		case Scanner::DT_CHAR:
+		case DT_CHAR:
 			value.char_ = b.value.char_;
 			break;
-		case Scanner::DT_STR:
+		case DT_STR:
 			value.string = b.value.string;
 			break;
 	}