sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse Source
This commit is contained in:
Lynix
2016-12-06 16:46:24 +01:00
parent e0935edd00 e66e0dfdce
commit 2217cf9661
129 changed files with 7831 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/RenderWindow.inl
View File

@@ -12,7 +12,7 @@ namespace Nz
{
}
inline RenderWindow::RenderWindow(VideoMode mode, const String& title, UInt32 style, const RenderWindowParameters& parameters) :
inline RenderWindow::RenderWindow(VideoMode mode, const String& title, WindowStyleFlags style, const RenderWindowParameters& parameters) :
RenderWindow()
{
ErrorFlags errFlags(ErrorFlag_ThrowException, true);
@@ -27,7 +27,7 @@ namespace Nz
Create(handle, parameters);
}
inline bool RenderWindow::Create(VideoMode mode, const String& title, UInt32 style, const RenderWindowParameters& parameters)
inline bool RenderWindow::Create(VideoMode mode, const String& title, WindowStyleFlags style, const RenderWindowParameters& parameters)
{
m_parameters = parameters;