diff options
author | Stijn Buys <ingar@osirion.org> | 2012-10-13 10:50:37 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2012-10-13 10:50:37 +0000 |
commit | a41a544a498baf2235348b2edb76781f442651d6 (patch) | |
tree | 157d95a700dc07a38cfd2e541614fe9f86308825 /src/math | |
parent | b0d67843c43f50f36a92c4b8694b3df380ce50b1 (diff) |
Minor math::Color cleanup.
Diffstat (limited to 'src/math')
-rw-r--r-- | src/math/color.cc | 2 | ||||
-rw-r--r-- | src/math/color.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/math/color.cc b/src/math/color.cc index 70a48e5..473d210 100644 --- a/src/math/color.cc +++ b/src/math/color.cc @@ -155,7 +155,7 @@ std::istream &operator>>(std::istream & is, Color & color) } //is >> color.a; - color.a = 1.0; + color.a = 1.0f; return (is); } diff --git a/src/math/color.h b/src/math/color.h index 507402d..605e738 100644 --- a/src/math/color.h +++ b/src/math/color.h @@ -21,7 +21,7 @@ public: /// create a color from float RGBA value Color(float red, float green, float blue, float alpha = 1.0f); /// create a greyscale color - Color(const float grey, const float = 1.0f); + Color(const float grey, const float alpha = 1.0f); /// create a copy from an existing color Color(Color const & other); |