diff --git a/data/scene/default.scene b/data/scene/default.scene index 4e9e9fab72..76f966f3d7 100644 --- a/data/scene/default.scene +++ b/data/scene/default.scene @@ -64,7 +64,7 @@ return { --"saturn", --"uranus", --"neptune", - --"stars", + "stars", --"stars-denver", "milkyway", --"milkyway-eso", diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp index e4ac87b941..552c36d664 100644 --- a/modules/iswa/util/dataprocessortext.cpp +++ b/modules/iswa/util/dataprocessortext.cpp @@ -195,12 +195,10 @@ std::vector DataProcessorText::processData(std::string data, properties: last = line.find_first_of(" \t", first); last = (last > 0)? last : lineSize; - if(option >= 0){ + if(option >= 0 && std::find(selectedOptions.begin(), selectedOptions.end(), option) != selectedOptions.end()){ // boost::spirit::qi::parse(&line[first], &line[last], boost::spirit::qi::float_, value); value = std::stof(line.substr(first, last)); - - if(std::find(selectedOptions.begin(), selectedOptions.end(), option) != selectedOptions.end()) - dataOptions[option][numValues] = processDataPoint(value, option); + dataOptions[option][numValues] = processDataPoint(value, option); } option++; diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon index f9ba0caae4..3de739a553 160000 --- a/modules/kameleon/ext/kameleon +++ b/modules/kameleon/ext/kameleon @@ -1 +1 @@ -Subproject commit f9ba0caae41dc13a752c71a2e873c02bb0dce7c3 +Subproject commit 3de739a55387051fb6fdfd327ad761dffa317420