Merge branch 'master' of https://github.com/godotengine/godot

1 files changed, 11 insertions, 4 deletions

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 4e815d044d..3d93ec9fa5 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -480,9 +480,9 @@ void _OS::set_use_vsync(bool p_enable) {
 	OS::get_singleton()->set_use_vsync(p_enable);
 }
 
-bool _OS::is_vsnc_enabled() const {
+bool _OS::is_vsync_enabled() const {
 
-	return OS::get_singleton()->is_vsnc_enabled();
+	return OS::get_singleton()->is_vsync_enabled();
 }
 
 
@@ -1172,7 +1172,7 @@ void _OS::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_thread_name","name"),&_OS::set_thread_name);
 
 	ObjectTypeDB::bind_method(_MD("set_use_vsync","enable"),&_OS::set_use_vsync);
-	ObjectTypeDB::bind_method(_MD("is_vsnc_enabled"),&_OS::is_vsnc_enabled);
+	ObjectTypeDB::bind_method(_MD("is_vsync_enabled"),&_OS::is_vsync_enabled);
 
 	ObjectTypeDB::bind_method(_MD("get_engine_version"),&_OS::get_engine_version);
 
@@ -2043,6 +2043,13 @@ _Directory::~_Directory() {
 		memdelete(d);
 }
 
+_Marshalls* _Marshalls::singleton=NULL;
+
+_Marshalls *_Marshalls::get_singleton()
+{
+	return singleton;
+}
+
 String _Marshalls::variant_to_base64(const Variant& p_var) {
 
 	int len;