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

Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-17 17:22:00 -04:00
parent 2af533e6fe 85e1f01ad5
commit c3a8bb9bde
11 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/datasphere.cpp
+5
View File
@@ -145,6 +145,11 @@ bool DataSphere::loadTexture(){
if(data.empty())
return false;
// auto v = _dataProcessor->filterValues();
// std::cout << std::to_string(v) << std::endl;
_backgroundValues.setValue(_dataProcessor->filterValues());
bool texturesReady = false;
std::vector<int> selectedOptions = _dataOptions.value();