Solve merge conflicts: develop --> globebrowsing

2026-05-05 10:59:47 -05:00 · 2016-08-02 18:50:10 -04:00
parent e832b953c1 b72167a270
commit 244c18fdc7
84 changed files with 1482 additions and 616 deletions
@@ -146,6 +146,7 @@ namespace openspace {
    protected:
        std::unique_ptr<ProgramObject> _programObject;

+
        // A raw pointer for the reason that it should not be deleted by the static
        // destructor and the normal destructor. This class has ownership
        static DebugRenderer* _reference;