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

Fix compilation warnings.

Browse Source
This commit is contained in:
Kalle Bladin
2017-07-14 22:48:32 +02:00
parent 2e4f31ded8
commit a232a1a0a7
11 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/layer/layeradjustment.cpp
+5 -5
View File
@@ -35,11 +35,6 @@ namespace {
LayerAdjustment::LayerAdjustment()
: properties::PropertyOwner("adjustment")
, _typeOption(
"type",
"Type",
properties::OptionProperty::DisplayType::Dropdown
)
, chromaKeyColor(
"chromaKeyColor",
"Chroma key color",
@@ -54,6 +49,11 @@ LayerAdjustment::LayerAdjustment()
0,
1
)
, _typeOption(
"type",
"Type",
properties::OptionProperty::DisplayType::Dropdown
)
, _onChangeCallback([](){})
{
// Add options to option properties
modules/globebrowsing/rendering/layer/layermanager.cpp
+3
View File
@@ -149,6 +149,9 @@ TileTextureInitData LayerManager::getTileTextureInitData(layergroupid::GroupID i
}
default: {
ghoul_assert(false, "Unknown layer group ID");
size_t tileSize = preferredTileSize ? preferredTileSize : 512;
return TileTextureInitData(tileSize, tileSize, GL_UNSIGNED_BYTE,
ghoul::opengl::Texture::Format::BGRA);
}
}
}