Merged master info NewAtmosphere.

2026-03-09 06:48:35 -05:00 · 2017-07-27 17:13:42 -04:00
parent 49c8af702b 02ce2a1b2a
commit a55110e286
130 changed files with 3573 additions and 1495 deletions
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -61,7 +61,6 @@ public:
    static std::unique_ptr<Renderable> createFromDictionary(const ghoul::Dictionary& dictionary);

    // constructors & destructor
-    Renderable();
    Renderable(const ghoul::Dictionary& dictionary);
    virtual ~Renderable();