From 4d2d157ed09bb066686f83803abd90809fe20b82 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 6 Jul 2014 20:53:58 +0000 Subject: Minor cleanups. --- src/model/material.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/model/material.h') diff --git a/src/model/material.h b/src/model/material.h index 94b4418..e2a1276 100644 --- a/src/model/material.h +++ b/src/model/material.h @@ -69,7 +69,7 @@ public: } /** - * @brief returns the material texture size + * @brief returns the material texture pixel size */ inline const math::Vector2f & size() const { return material_size; @@ -153,7 +153,6 @@ public: * */ void set_colortype(ColorType colortype); - /** * @brief set a specified surface flag * @see flags() @@ -221,7 +220,7 @@ private: /// the materials registry static Registry material_registry; - static void load_shader(const std::string &shadername); + static void load_shaderfile(const std::string &shadername); static LoaderFuncPtr material_loaderfunc; }; -- cgit v1.2.3