godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2937 from koalefant/master 

fixed crash when creating new object with wrong number of arguments (rebased)
This commit is contained in:
Rémi Verschelde 2015-11-28 18:15:47 +01:00
parent e4c872a260 bc998c9195
commit 280d72eb8b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/object.cpp
View File

@ -970,7 +970,10 @@ void Object::set_script_instance(ScriptInstance *p_instance) {
script_instance=p_instance; script_instance=p_instance;
script=p_instance->get_script().get_ref_ptr(); if (p_instance)
script=p_instance->get_script().get_ref_ptr();
else
script=RefPtr();
} }
RefPtr Object::get_script() const { RefPtr Object::get_script() const {