diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-14 18:14:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 18:14:05 +0200 |
| commit | 5e373c2a6926705b52a116ca00e5eff131b98274 (patch) | |
| tree | 4905f343cd95f7a2698862083a766f0832911a19 /modules/gdscript/gd_functions.cpp | |
| parent | 2f57249c29d35c7396209213e7e5b39bc328b3f4 (diff) | |
| parent | 2f2cea070e062415f290103f1823ab17ea4e5874 (diff) | |
Merge pull request #6813 from Faless/fix_6801_bis
Re-Allow absolute paths, make them behave correctly
Diffstat (limited to 'modules/gdscript/gd_functions.cpp')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index e82eb83773..e224ce4718 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -840,10 +840,6 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument=0; r_ret=Variant(); - } else if(((String)(*p_args[0])).begins_with("/")) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; - r_error.argument=0; - r_ret=RTR("Paths cannot start with '/', absolute paths must start with 'res://', 'user://', or 'local://'"); } else { r_ret=ResourceLoader::load(*p_args[0]); } |