Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master-dev' into master-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
reinago committed Jul 23, 2018
2 parents f085d25 + cebcfe9 commit 9cbc432
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion plugins/infovis/src/ScatterplotMatrixRenderer2D.cpp
Expand Up @@ -325,7 +325,7 @@ void ScatterplotMatrixRenderer2D::drawAxes(void) {

this->axisFont.ClearBatchCache();

const auto axisColor = this->axisColorParam.Param<core::param::ColorParam>()->Value();
const auto* axisColor = this->axisColorParam.Param<core::param::ColorParam>()->Value();
const auto columnCount = this->floatTable->GetColumnsCount();
const auto columnInfos = this->floatTable->GetColumnsInfos();
const float size = this->cellSizeParam.Param<core::param::FloatParam>()->Value();
Expand Down

0 comments on commit 9cbc432

Please sign in to comment.