6 files changed, 29 insertions, 24 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 94d9e22a1e..522c42928c 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -390,6 +390,12 @@ bool _OS::is_ok_left_and_cancel_right() const {
 	return OS::get_singleton()->get_swap_ok_cancel();
 }
 
+Error _OS::set_thread_name(const String& p_name) {
+
+	return Thread::set_name(p_name);
+};
+
+
 /*
 enum Weekday {
 	DAY_SUNDAY,
@@ -877,6 +883,8 @@ void _OS::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("alert","text","title"),&_OS::alert,DEFVAL("Alert!"));
 
+	ObjectTypeDB::bind_method(_MD("set_thread_name","name"),&_OS::set_thread_name);
+
 
 	BIND_CONSTANT( DAY_SUNDAY );
 	BIND_CONSTANT( DAY_MONDAY );
@@ -1895,13 +1903,7 @@ void _Thread::_start_func(void *ud) {
 	Variant::CallError ce;
 	const Variant* arg[1]={&t->userdata};
 
-	// we don't know our thread pointer yet :(
-	if (t->name == "") {
-		// come up with a better name using maybe the filename on the Script?
-		//t->thread->set_name(t->target_method);
-	} else {
-		//t->thread->set_name(t->name);
-	};
+	Thread::set_name(t->target_method);
 
 	t->ret=t->target_instance->call(t->target_method,arg,1,ce);
 	if (ce.error!=Variant::CallError::CALL_OK) {
@@ -1992,24 +1994,12 @@ Variant _Thread::wait_to_finish() {
 	return r;
 }
 
-Error _Thread::set_name(const String &p_name) {
-
-	name = p_name;
-
-	if (thread) {
-		return thread->set_name(p_name);
-	};
-
-	return OK;
-};
-
 void _Thread::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("start:Error","instance","method","userdata","priority"),&_Thread::start,DEFVAL(Variant()),DEFVAL(PRIORITY_NORMAL));
 	ObjectTypeDB::bind_method(_MD("get_id"),&_Thread::get_id);
 	ObjectTypeDB::bind_method(_MD("is_active"),&_Thread::is_active);
 	ObjectTypeDB::bind_method(_MD("wait_to_finish:Variant"),&_Thread::wait_to_finish);
-	ObjectTypeDB::bind_method(_MD("set_name:Error", "name"),&_Thread::set_name);
 
 	BIND_CONSTANT( PRIORITY_LOW );
 	BIND_CONSTANT( PRIORITY_NORMAL );
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index e03657f3a0..cb8fba3dcd 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -270,6 +270,8 @@ public:
 
 	bool is_ok_left_and_cancel_right() const;
 
+	Error set_thread_name(const String& p_name);
+
 	static _OS *get_singleton() { return singleton; }
 
 	_OS();
@@ -512,7 +514,6 @@ protected:
 	Object *target_instance;
 	StringName target_method;
 	Thread *thread;
-	String name;
 	static void _bind_methods();
 	static void _start_func(void *ud);
 public:
@@ -528,7 +529,6 @@ public:
 	String get_id() const;
 	bool is_active() const;
 	Variant wait_to_finish();
-	Error set_name(const String& p_name);
 
 	_Thread();
 	~_Thread();
diff --git a/core/global_constants.cpp b/core/global_constants.cpp
index 92e50a8b96..89d918fed9 100644
--- a/core/global_constants.cpp
+++ b/core/global_constants.cpp
@@ -476,6 +476,16 @@ static _GlobalConstant _global_constants[]={
 	BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_EDITOR  ),
 	BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_NETWORK  ),
 	BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_DEFAULT  ),
+
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_NORMAL ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_EDITOR ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_NOSCRIPT ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_CONST ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_REVERSE ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_VIRTUAL ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAG_FROM_SCRIPT ),
+	BIND_GLOBAL_CONSTANT( METHOD_FLAGS_DEFAULT ),
+
 	{"TYPE_NIL",Variant::NIL},
 	{"TYPE_BOOL",Variant::BOOL},
 	{"TYPE_INT",Variant::INT},
diff --git a/core/method_bind.h b/core/method_bind.h
index 4c2598e50c..da3d7c1062 100644
--- a/core/method_bind.h
+++ b/core/method_bind.h
@@ -50,6 +50,7 @@ enum MethodFlags {
 	METHOD_FLAG_CONST=8,
 	METHOD_FLAG_REVERSE=16, // used for events
 	METHOD_FLAG_VIRTUAL=32,
+	METHOD_FLAG_FROM_SCRIPT=64,
 	METHOD_FLAGS_DEFAULT=METHOD_FLAG_NORMAL,
 };
 
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index 7fb1e969d4..f5d984876d 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -32,6 +32,7 @@
 Thread* (*Thread::create_func)(ThreadCreateCallback,void *,const Settings&)=NULL;
 Thread::ID (*Thread::get_thread_ID_func)()=NULL;
 void (*Thread::wait_to_finish_func)(Thread*)=NULL;
+Error (*Thread::set_name_func)(const String&)=NULL;
 
 Thread::ID Thread::_main_thread_id=0;
 
@@ -60,6 +61,9 @@ void Thread::wait_to_finish(Thread *p_thread) {
 
 Error Thread::set_name(const String &p_name) {
 
+	if (set_name_func)
+		return set_name_func(p_name);
+
 	return ERR_UNAVAILABLE;
 };
 
diff --git a/core/os/thread.h b/core/os/thread.h
index 5711561809..4fead72b94 100644
--- a/core/os/thread.h
+++ b/core/os/thread.h
@@ -63,6 +63,7 @@ protected:
 	static Thread* (*create_func)(ThreadCreateCallback p_callback,void *,const Settings&);
 	static ID (*get_thread_ID_func)();
 	static void (*wait_to_finish_func)(Thread*);
+	static Error (*set_name_func)(const String&);
 
     friend class Main;
 
@@ -73,10 +74,9 @@ protected:
 public:
 		
 
-	virtual Error set_name(const String& p_name);
-		
 	virtual ID get_ID() const=0;
-	
+
+	static Error set_name(const String &p_name);
 	_FORCE_INLINE_ static ID get_main_ID() { return _main_thread_id; } ///< get the ID of the main thread
 	static ID get_caller_ID(); ///< get the ID of the caller function ID
 	static void wait_to_finish(Thread *p_thread); ///< waits until thread is finished, and deallocates it.