aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-11-03 15:23:32 +01:00
commit ff1e902b5b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -490,7 +490,6 @@ bool CDriverGL::unInit()
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// nothing to do
[_autoreleasePool release]; [_autoreleasePool release];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
@ -1460,7 +1459,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
pos = 0; pos = 0;
hwndParent = NULL; hwndParent = NULL;
} }
window = CreateWindowW(L"NLClass", L"NeL Window", dwStyle, window = CreateWindowW(L"NLClass", L"NeL Window", dwStyle,
pos, pos, mode.Width, mode.Height, hwndParent, NULL, GetModuleHandle(NULL), NULL); pos, pos, mode.Width, mode.Height, hwndParent, NULL, GetModuleHandle(NULL), NULL);
if (window == EmptyWindow) if (window == EmptyWindow)
@ -1677,8 +1676,6 @@ bool CDriverGL::destroyWindow()
[[containerView() window] release]; [[containerView() window] release];
[containerView() release]; [containerView() release];
[_glView release]; [_glView release];
[_autoreleasePool release];
} }
_ctx = nil; _ctx = nil;