solve merge conflict

This commit is contained in:
Michael Nilsson
2016-05-24 14:10:37 -04:00
21 changed files with 495 additions and 220 deletions
-3
View File
@@ -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;