Merge branch 'master' into feature/gamma-correction

This commit is contained in:
Ylva Selling
2022-06-29 04:21:46 -04:00
197 changed files with 492 additions and 382 deletions

View File

@@ -60,7 +60,7 @@ namespace {
std::remove_if(
str.begin(), str.end(),
[](char c) {
return c < 0 || c >= 128;
return c < 0;
}
),
str.end()
@@ -553,8 +553,6 @@ namespace {
using namespace openspace;
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
const ImageData& image = module->getWwtDataHandler()->getImage(imageIndex);
TargetBrowserPair* pair = module->pair(identifier);
if (pair) {
pair->removeSelectedImage(imageIndex);