mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-17 01:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source
This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
parent 0015cbb6f6 afa1d6d33e
commit 7e4bb0b2c6
246 changed files with 4256 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/wrapper/sgctwindowwrapper.cpp
View File

@@ -171,7 +171,7 @@ glm::vec2 SGCTWindowWrapper::dpiScaling() const {
int SGCTWindowWrapper::currentNumberOfAaSamples() const {
return sgct::Engine::instance()->getCurrentWindowPtr()->getNumberOfAASamples();
}
}
bool SGCTWindowWrapper::isRegularRendering() const {
sgct::SGCTWindow* w = sgct::Engine::instance()->getCurrentWindowPtr();