diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
| commit | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch) | |
| tree | 872a375b64d93fd6aaf1239e058a13630c9cfabe /core/bind/core_bind.h | |
| parent | 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff) | |
| parent | b2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/bind/core_bind.h')
| -rw-r--r-- | core/bind/core_bind.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 24ea810767..172f33dac5 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -508,6 +508,7 @@ protected: Object *target_instance; StringName target_method; Thread *thread; + String name; static void _bind_methods(); static void _start_func(void *ud); public: @@ -523,6 +524,7 @@ public: String get_id() const; bool is_active() const; Variant wait_to_finish(); + Error set_name(const String& p_name); _Thread(); ~_Thread(); |