diff options
| author | James Cowgill <james410@cowgill.org.uk> | 2015-09-12 23:54:56 +0100 |
|---|---|---|
| committer | James Cowgill <james410@cowgill.org.uk> | 2015-09-12 23:54:56 +0100 |
| commit | 301fd78b3ac87cf1fbce9d2c955db89094a304a5 (patch) | |
| tree | ca19b5d935af18b7e5da4beaa2f4b150a1192833 /include | |
| parent | 232f6c9906817eee494907d7bbe8ddf2dacf8fbf (diff) | |
Imported Upstream version 2.3.2+dfsg
Diffstat (limited to 'include')
| -rw-r--r-- | include/SFML/Config.hpp | 2 | ||||
| -rw-r--r-- | include/SFML/Graphics/Font.hpp | 2 | ||||
| -rw-r--r-- | include/SFML/Graphics/Texture.hpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp index 294f282..05c7719 100644 --- a/include/SFML/Config.hpp +++ b/include/SFML/Config.hpp @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////// #define SFML_VERSION_MAJOR 2 #define SFML_VERSION_MINOR 3 -#define SFML_VERSION_PATCH 1 +#define SFML_VERSION_PATCH 2 //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp index 2b19d39..ac6b00e 100644 --- a/include/SFML/Graphics/Font.hpp +++ b/include/SFML/Graphics/Font.hpp @@ -414,7 +414,7 @@ private: /// sf::Text text2; /// text2.setFont(font); /// text2.setCharacterSize(50); -/// text1.setStyle(sf::Text::Italic); +/// text2.setStyle(sf::Text::Italic); /// \endcode /// /// Apart from loading font files, and passing them to instances diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp index 29260d1..2471531 100644 --- a/include/SFML/Graphics/Texture.hpp +++ b/include/SFML/Graphics/Texture.hpp @@ -509,6 +509,7 @@ private: bool m_isSmooth; ///< Status of the smooth filter bool m_isRepeated; ///< Is the texture in repeat mode? mutable bool m_pixelsFlipped; ///< To work around the inconsistency in Y orientation + bool m_fboAttachment; ///< Is this texture owned by a framebuffer object? Uint64 m_cacheId; ///< Unique number that identifies the texture to the render target's cache }; |