BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Fix compile error with OS X 10.10 SDK, bug #463

Browse Source 
Thanks @Ryan Schmidt for report and patch: https://sourceforge.net/p/irrlicht/bugs/463


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6522 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2023-08-04 15:46:17 +00:00
parent 2149bfb317
commit e2a742e2fc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes.txt
View File

@ -1,6 +1,7 @@
-------------------------- --------------------------
Changes in 1.9 (not yet released) Changes in 1.9 (not yet released)
- Fix compile error with OS X 10.10 SDK, bug #463. Thanks @Ryan Schmidt for report and patch.
- Optimize quaternion::rotationFromTo. Thanks @Robert Eisele for patch and proof (https://raw.org/proof/quaternion-from-two-vectors) - Optimize quaternion::rotationFromTo. Thanks @Robert Eisele for patch and proof (https://raw.org/proof/quaternion-from-two-vectors)
- Shader material example shows now how to pass material values. - Shader material example shows now how to pass material values.
In 1.8 we could still use gl_FrontMaterial, but that is no longer supported in shaders In 1.8 we could still use gl_FrontMaterial, but that is no longer supported in shaders

6
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -867,7 +867,7 @@ void CIrrDeviceMacOSX::createDriver()
SoftwareRendererType = 2; SoftwareRendererType = 2;
if (Window) if (Window)
{ {
Window.contentView.wantsLayer = YES; [[Window contentView] setWantsLayer:YES];
} }
#else #else
os::Printer::log("No Software driver support compiled in.", ELL_ERROR); os::Printer::log("No Software driver support compiled in.", ELL_ERROR);
@ -880,7 +880,7 @@ void CIrrDeviceMacOSX::createDriver()
SoftwareRendererType = 1; SoftwareRendererType = 1;
if (Window) if (Window)
{ {
Window.contentView.wantsLayer = YES; [[Window contentView] setWantsLayer:YES];
[ Window setOpaque:YES]; [ Window setOpaque:YES];
} }
@ -1600,7 +1600,7 @@ bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rec
NSImage *image = [[[NSImage alloc] initWithSize: imageSize] autorelease]; NSImage *image = [[[NSImage alloc] initWithSize: imageSize] autorelease];
[image addRepresentation: rep]; [image addRepresentation: rep];
Window.contentView.layer.contents = image; [[[Window contentView] layer] setContents:image];
} }
return true; return true;
} }