diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-20 12:32:32 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-20 12:32:32 -0300 |
| commit | 9783f6fc969947fdbf666950ab3da21ac462c57e (patch) | |
| tree | 44e8458cc19c4f5bfe230a7972a3958732b54c77 /modules/gdscript/gd_script.cpp | |
| parent | cf0a419efae977eba3ed17437f0475a0d7a11bbe (diff) | |
| parent | 7dbc19f32db7b63062e715381923c873bf18683e (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 982584c75c..97d97f1ef4 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1440,8 +1440,8 @@ GDInstance* GDScript::_create_instance(const Variant** p_args,int p_argcount,Obj if (err.error!=Variant::CallError::CALL_OK) { instance->script=Ref<GDScript>(); + instance->owner->set_script_instance(NULL); instances.erase(p_owner); - memdelete(instance); ERR_FAIL_COND_V(err.error!=Variant::CallError::CALL_OK, NULL); //error consrtucting } |