Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
5d774d2b
Commit
5d774d2b
authored
Mar 30, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixOSXMSAA' into 'master'
fixOSXMSAA Closes
OpenFlipper-Free#130
See merge request
!72
parents
02bf8693
8a4be778
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
common/GlobalOptions.cc
common/GlobalOptions.cc
+0
-4
No files found.
common/GlobalOptions.cc
View file @
5d774d2b
...
...
@@ -394,11 +394,7 @@ void samples(int _samples) {
/// Get opengl MSAA sample count
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
();
#endif
}
/// Store opengl stereo mode setting
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment