godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #26034 from QbieShay/issue_25596

Browse Source 
Inheriting from virtual class no longer causes the engine to crash.
This commit is contained in:
Rémi Verschelde
2019-02-28 11:00:20 +01:00
committed by GitHub
parent a4b687bdab 8f22c2684f
commit f2003b1a7e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gdscript/gdscript.cpp
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()); ERR_FAIL_COND_V(_baseptr->native.is_null(), Variant());
if (_baseptr->native.ptr()) { if (_baseptr->native.ptr()) {
owner = _baseptr->native->instance(); owner = _baseptr->native->instance();
} else { } else {
owner = memnew(Reference); //by default, no base means use reference 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); Reference *r = Object::cast_to<Reference>(owner);
if (r) { if (r) {