Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration

# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
This commit is contained in:
Johann Granström
2020-09-24 11:47:21 +02:00
8 changed files with 219 additions and 4378 deletions

View File

@@ -103,6 +103,12 @@ namespace openspace {
new DoubleVerifier,
Optional::Yes,
SizeInfo.description
},
{
ToggleVisibilityInfo.identifier,
new BoolVerifier,
Optional::Yes,
ToggleVisibilityInfo.description
}
}
};