mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflict.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-11 11:02:03 -04:00
parent 2cde44c822 ef11f45e38
commit 1e37e62bdc
15 changed files with 294 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/culling.cpp
+1
View File
@@ -115,6 +115,7 @@ namespace openspace {
return pointScreenSpace;
}
//////////////////////////////////////////////////////////////////////////////////////
// HORIZON CULLER //
//////////////////////////////////////////////////////////////////////////////////////