diff options
| author | Stijn Buys <ingar@osirion.org> | 2014-07-06 20:53:58 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2014-07-06 20:53:58 +0000 |
| commit | 4d2d157ed09bb066686f83803abd90809fe20b82 (patch) | |
| tree | c1cbc5a354edbf84fd3f9ed84807266924d42267 /src/model/material.h | |
| parent | c7f28c2c0c7d23712552f0cd6ea0cf462068e081 (diff) | |
Minor cleanups.
Diffstat (limited to 'src/model/material.h')
| -rw-r--r-- | src/model/material.h | 5 |
1 files changed, 2 insertions, 3 deletions
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; }; |