mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-05 03:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use shorter struct name. Previous name caused linker error LNK1179

Browse Source
This commit is contained in:
Erik Broberg
2016-07-21 16:57:48 -04:00
parent b44e761eba
commit f4fa144606
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/tile/TileProviderManager.cpp
View File

@@ -119,7 +119,7 @@ namespace openspace {
{
}
void TileProviderManager::initTexures(std::vector<TileProviderWithName>& dest,
void TileProviderManager::initTexures(std::vector<NamedTileProvider>& dest,
const ghoul::Dictionary& texturesDict, const TileProviderInitData& initData)
{
// Create TileProviders for all textures within this category

6
modules/globebrowsing/tile/TileProviderManager.h
View File

@@ -43,7 +43,7 @@
namespace openspace {
struct TileProviderWithName {
struct NamedTileProvider {
std::string name;
std::shared_ptr<TileProvider> tileProvider;
bool isActive;
@@ -57,7 +57,7 @@ namespace openspace {
const std::vector<std::shared_ptr<TileProvider>> TileProviderGroup::getActiveTileProviders() const;
std::vector<TileProviderWithName> tileProviders;
std::vector<NamedTileProvider> tileProviders;
bool levelBlendingEnabled;
};
@@ -81,7 +81,7 @@ namespace openspace {
private:
static void initTexures(
std::vector<TileProviderWithName>& destination,
std::vector<NamedTileProvider>& destination,
const ghoul::Dictionary& dict,
const TileProviderInitData& initData);