Merge branch 'master' of github.com:OpenSpace/OpenSpace

2026-01-06 03:29:44 -06:00 · 2022-02-10 16:00:40 +01:00
parent 30212b6768 72110be88c
commit 51937d9461
23 changed files with 102 additions and 479 deletions
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -28,7 +28,6 @@
 #include <modules/server/include/jsonconverters.h>
 #include <modules/volume/transferfunctionhandler.h>
 #include <openspace/engine/globals.h>
-#include <openspace/engine/virtualpropertymanager.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/network/parallelpeer.h>
@@ -88,8 +87,7 @@ json GetPropertyTopic::allProperties() {
                global::renderEngine,
                global::luaConsole,
                global::parallelPeer,
-                global::navigationHandler,
-                global::virtualPropertyManager,
+                global::navigationHandler
            }
        }
    };