Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Gepetto
OpenSceneGraph
Commits
695b836a
Commit
695b836a
authored
Apr 29, 2020
by
Robert Osfield
Browse files
Merge branch 'master' of
https://github.com/openscenegraph/OpenSceneGraph
parents
4a27b7a0
f089d2e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/osgViewer/GraphicsWindowCocoa.mm
View file @
695b836a
...
...
@@ -1223,6 +1223,7 @@ bool GraphicsWindowCocoa::realizeImplementation()
[
_view
setAutoresizingMask
:
(
NSViewWidthSizable
|
NSViewHeightSizable
)
];
[
_view
setGraphicsWindowCocoa
:
this
];
[
_view
setOpenGLContext
:
_context
];
[
_view
setWantsBestResolutionOpenGLSurface
:
NO
];
// enable multitouch
if
(
_multiTouchEnabled
||
(
windowData
&&
windowData
->
isMultiTouchEnabled
()))
...
...
@@ -1305,7 +1306,6 @@ bool GraphicsWindowCocoa:: makeCurrentImplementation()
{
if
(
_updateContext
)
{
[
_context
update
];
_updateContext
=
false
;
}
...
...
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