Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #26034 from QbieShay/issue_25596 

Inheriting from virtual class no longer causes the engine to crash.
3.1
Rémi Verschelde 2019-02-28 11:00:20 +07:00 committed by GitHub
parent a4b687bdab 8f22c2684f
commit f2003b1a7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gdscript/gdscript.cpp
Unescape Escape View File

@ -152,12 +152,13 @@ Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallErro
}
ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant());
if (_baseptr->native.ptr()) {
owner = _baseptr->native->instance();
} else {
owner = memnew(Reference); //by default, no base means use reference
}
ERR_EXPLAIN("Can't inherit from a virtual class");
ERR_FAIL_COND_V(!owner, Variant());
Reference *r = Object::cast_to<Reference>(owner);
if (r) {