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

Solve merge conflicts and fix bug in LayeredTextureUniformProvider

Browse Source
This commit is contained in:
Erik Broberg
2016-08-11 17:05:14 -04:00
parent 95da433397 af672b6a4e
commit 1dd569a3e1
26 changed files with 193 additions and 4076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/tile/tileprovidermanager.cpp
-1
View File
@@ -66,7 +66,6 @@ namespace openspace {
//////////////////////////////////////////////////////////////////////////////////////
TileProviderManager::TileProviderManager(
const ghoul::Dictionary& textureCategoriesDictionary,
const ghoul::Dictionary& textureInitDictionary){