Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-30 22:08:10 -03:00
9 changed files with 71 additions and 80 deletions
+7
View File
@@ -456,6 +456,13 @@ private:
bool wireframe;
// Default filter.
Texture::Filter defaultFilter;
// Default mipmap filter and sharpness.
Texture::FilterMode defaultMipmapFilter;
float defaultMipmapSharpness;
DisplayState();
DisplayState(const DisplayState &other);
~DisplayState();