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

This commit is contained in:
Sebastian Piwell
2016-05-16 13:36:37 -04:00
5 changed files with 98 additions and 96 deletions

View File

@@ -263,7 +263,6 @@ bool DataPlane::createShader(){
}
}
void DataPlane::setTransferFunctions(std::string tfPath){
std::string line;
std::ifstream tfFile(absPath(tfPath));