diff options
| author | mostafahassan <habib_musse@hotmail.com> | 2015-03-31 21:59:39 +0200 |
|---|---|---|
| committer | mostafahassan <habib_musse@hotmail.com> | 2015-03-31 21:59:39 +0200 |
| commit | ec1aea5b3b85ec49723204796446a022f1c05ec2 (patch) | |
| tree | 5d8f4e8ba9daa41b9a9daa2304ce3f137cd77f99 /modules | |
| parent | 3d4cc27bad8fe05f38488c52ef6bb4c846993209 (diff) | |
| parent | 73ff3ac2180f73610392831d437dd0a1862b8dd8 (diff) | |
Merge branch 'pr_PreventScriptFromExtendingItself'
Diffstat (limited to 'modules')
| -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 06c746c4fb..f13b51c008 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1689,7 +1689,7 @@ bool GDScript::_update_exports() { } - if (c->extends_used && String(c->extends_file)!="") { + if (c->extends_used && String(c->extends_file)!="" && String(c->extends_file) != get_path()) { String path = c->extends_file; if (path.is_rel_path()) { |