mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-23 20:50:59 -05:00
solve merge conflict
This commit is contained in:
@@ -142,9 +142,6 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user