mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source
This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
parent 0015cbb6f6 afa1d6d33e
commit 7e4bb0b2c6
246 changed files with 4256 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fieldlines/rendering/renderablefieldlines.cpp
+2 -2
View File
@@ -104,7 +104,7 @@ namespace {
namespace openspace {
RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
: Renderable(dictionary)
, _stepSize(StepSizeInfo, defaultFieldlineStepSize, 0.f, 10.f)
, _classification(Classification, true)
@@ -427,7 +427,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
if (model != vectorFieldKameleonModelBATSRUS) {
//modelType = KameleonWrapper::Model::BATSRUS;
//else {
LERROR(keyVectorField << "." << keyVectorFieldVolumeModel << " model '" <<
LERROR(keyVectorField << "." << keyVectorFieldVolumeModel << " model '" <<
model << "' not supported");
return {};
}