Commit 5d774d2b authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fixOSXMSAA' into 'master'

fixOSXMSAA

Closes OpenFlipper-Free#130

See merge request !72
parents 02bf8693 8a4be778
...@@ -394,11 +394,7 @@ void samples(int _samples) { ...@@ -394,11 +394,7 @@ void samples(int _samples) {
/// Get opengl MSAA sample count /// Get opengl MSAA sample count
int samples() { int samples() {
#if defined(ARCH_DARWIN) //Disable MSAA on OSX by default until workaround is found.
return OpenFlipperSettings().value("Core/OpenGL/Samples",0).toInt();
#else
return OpenFlipperSettings().value("Core/OpenGL/Samples",4).toInt(); return OpenFlipperSettings().value("Core/OpenGL/Samples",4).toInt();
#endif
} }
/// Store opengl stereo mode setting /// Store opengl stereo mode setting
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment