Merge branch 'master' of somweyr.de:ousia

Conflicts:
	application/src/core/model/Document.hpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/common/Argument.cpp b/src/core/common/Argument.cpp
index 78dd4b4..3461868 100644
--- a/src/core/common/Argument.cpp
+++ b/src/core/common/Argument.cpp
@@ -91,13 +91,13 @@ Argument Argument::String(std::string name,
 
 Argument Argument::Object(std::string name, const RttiType &type)
 {
-	return Argument(std::move(name), type, RttiTypes::None, nullptr, false);
+	return Argument(std::move(name), type, RttiTypes::None, Variant::fromObject(nullptr), false);
 }
 
 Argument Argument::Object(std::string name, const RttiType &type,
                           std::nullptr_t)
 {
-	return Argument(std::move(name), type, RttiTypes::None, nullptr, true);
+	return Argument(std::move(name), type, RttiTypes::None, Variant::fromObject(nullptr), true);
 }
 
 Argument Argument::Function(std::string name)