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

solve merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-24 14:10:37 -04:00
parent 8633bc8522 e3c1093310
commit 8f6bc7d418
21 changed files with 495 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/dataplane.cpp
+1 -1
View File
@@ -196,7 +196,7 @@ bool DataPlane::loadTexture() {
if(data.empty())
return false;
// _backgroundValues.setValue(_dataProcessor->filterValues());
_backgroundValues.setValue(_dataProcessor->filterValues());
bool texturesReady = false;
std::vector<int> selectedOptions = _dataOptions.value();