diff options
| author | Juan Linietsky | 2015-04-07 21:21:06 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-04-07 21:21:06 -0300 |
| commit | 963845eea9794c1e35e536da57cb22b01fd58fa7 (patch) | |
| tree | 5d963252f3bc2cb175bfdda91d1369aace97a45b /modules/gdscript/gd_script.cpp | |
| parent | 22997294fa87a1346ef4617b887953a356943354 (diff) | |
| parent | ef222aea8976d66986e8c05a82e9d6f938a87235 (diff) | |
| download | godot-963845eea9794c1e35e536da57cb22b01fd58fa7.tar.gz godot-963845eea9794c1e35e536da57cb22b01fd58fa7.tar.zst godot-963845eea9794c1e35e536da57cb22b01fd58fa7.zip | |
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 06c746c4f..f13b51c00 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()) { |