Merged master into NewAtmosphere.

2026-04-23 04:30:09 -05:00 · 2017-05-18 12:33:08 -04:00
parent 87843b57a5 187b7b6506
commit d632b41710
105 changed files with 2686 additions and 3276 deletions
@@ -31,6 +31,7 @@
 #include <modules/globebrowsing/rendering/gpu/gpulayermanager.h>
 #include <modules/globebrowsing/rendering/layer/layergroup.h>
 #include <modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h>
+#include <openspace/util/updatestructures.h>

 namespace {
    const char* keyFrame = "Frame";