Compile fixes after merge

modules/sync/syncmodule.cpp

@@ -31,10 +31,10 @@
 
 #include <ghoul/misc/assert.h>
 
-#include <modules/sync/syncs/syncrhonization.h>
-#include <modules/sync/syncs/httpsyncrhonization.h>
-#include <modules/sync/syncs/resourcesyncrhonization.h>
-#include <modules/sync/syncs/torrentsyncrhonization.h>
+#include <modules/sync/syncs/synchronization.h>
+#include <modules/sync/syncs/httpsynchronization.h>
+#include <modules/sync/syncs/resourcesynchronization.h>
+#include <modules/sync/syncs/torrentsynchronization.h>
 
 
 namespace openspace {

modules/sync/syncmodule.h

@@ -41,4 +41,6 @@ protected:
     void internalInitialize() override;
 };
 
-} // namespace openspace
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SPACE___SYNCMODULE___H__

src/scene/assetloader.cpp

@@ -272,9 +272,9 @@ void AssetLoader::pushAsset(Asset* asset) {
     lua_pushcfunction(*_luaState, &assetloader::noOperation);
     lua_setfield(*_luaState, assetTableIndex, OnDeinitializeFunctionName);
 
-    // Register empty data table on imported asset
+    // Register empty sync table on imported asset
     lua_newtable(*_luaState);
-    lua_setfield(*_luaState, assetTableIndex, DataTableName);
+    lua_setfield(*_luaState, assetTableIndex, SyncTableName);
 
     // Register empty dependant table on imported asset.
     // (importer => dependant object)
@@ -492,7 +492,7 @@ int AssetLoader::Asset::resolveSyncedResourceLua() {
 }
 
 AssetLoader::Asset::Asset(AssetLoader* loader, ghoul::filesystem::Directory directory)
-    : PropertyOwner("RootAsset")
+    : PropertyOwner({ "RootAsset", "Root asset" })
     , _assetDirectory(directory)
     , _loader(loader)
     , _initialized(false)
@@ -500,7 +500,7 @@ AssetLoader::Asset::Asset(AssetLoader* loader, ghoul::filesystem::Directory dire
 {}
 
 AssetLoader::Asset::Asset(AssetLoader* loader, ghoul::filesystem::Directory baseDirectory, std::string assetPath)
-    : PropertyOwner(assetPath)
+    : PropertyOwner({ assetPath, assetPath })
     , _initialized(false)
     , _hasLuaTable(true)
     , _loader(loader)
@@ -697,8 +697,8 @@ bool AssetLoader::Asset::hasInitializedDependants(InitializationRequirement init
 
 // Dependency toggle
 AssetLoader::DependencyToggle::DependencyToggle(Asset* dependency, Asset* dependant, bool enabled)
-    : PropertyOwner(dependency->name())
-    , _enabled("enabled", "Enabled", enabled)
+    : PropertyOwner({ dependency->name(), dependency->name() })
+    , _enabled({ "enabled", "Enabled", "Enable dependency" }, enabled)
     , _dependency(dependency)
     , _dependant(dependant)
 {

src/scene/scene_doc.inl

@@ -80,18 +80,16 @@ documentation::Documentation Scene::Documentation() {
             new TableVerifier({
                 {
                 "*",
-                new StringAnnotationVerifier(
-                    "Loadable asset folders. This means that they either have to point "
-                    "to a folder that contains a AssetFile or a folder which contains "
-                    "other folders that eventually contain AssetFile. This second "
-                    "recursive approach is useful for grouping modules into logical "
-                    "units."
-
-                ),
-                Optional::Yes,
-                "Asset folders"
+                new StringVerifier,
+                Optional::No,
+                "Loadable asset folders. This means that they either have to point "
+                "to a folder that contains a AssetFile or a folder which contains "
+                "other folders that eventually contain AssetFile. This second "
+                "recursive approach is useful for grouping modules into logical "
+                "units."
                 }
             }),
+            Optional::Yes,
             "This is the list of assets that will be loaded into the initial scene. The "
             "values in this table have to correspond to folders relative to the "
             "ScenePath key. The order in which the modules are loaded is the same as the "

src/scene/scenegraphnode_doc.inl

@@ -48,11 +48,10 @@ documentation::Documentation SceneGraphNode::Documentation() {
             new StringAnnotationVerifier(
                 "If specified, this must be a name for another scenegraph node"
             ),
-            Optional::No,
+            Optional::Yes,
             "This names the parent of the currently specified scenegraph node. The "
             "parent must already exist in the scene graph. If not specified, the node "
             "will be attached to the root of the scenegraph.",
-            Optional::Yes
         },
         {
             "Renderable",