diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-17 14:52:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 14:52:43 +0100 |
| commit | 0159787864e7ecce60a4d3142f5c82e024710f89 (patch) | |
| tree | 84a76d3c77d7451bb67e99f18d3e9531a5515480 | |
| parent | b8577ecce1bb62a4a589d02bdd71b701e5bdea81 (diff) | |
| parent | a69e88e467be494bbf1f7b768902e6a9e77ed7f1 (diff) | |
| download | redot-engine-0159787864e7ecce60a4d3142f5c82e024710f89.tar.gz | |
Merge pull request #37111 from RandomShaper/imvu/unexpose_include_drive
Remove meaningless parameter from bindings
| -rw-r--r-- | core/bind/core_bind.cpp | 4 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 2 | ||||
| -rw-r--r-- | doc/classes/Directory.xml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index e7a1f8b2ee..b16e2fdf87 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -2344,10 +2344,10 @@ Error _Directory::change_dir(String p_dir) { ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); return d->change_dir(p_dir); } -String _Directory::get_current_dir(bool p_include_drive) { +String _Directory::get_current_dir() { ERR_FAIL_COND_V_MSG(!d, "", "Directory must be opened before use."); - return d->get_current_dir(p_include_drive); + return d->get_current_dir(); } Error _Directory::make_dir(String p_dir) { diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index fc6419b7d8..3a5bd28ce8 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -572,7 +572,7 @@ public: int get_current_drive(); Error change_dir(String p_dir); // Can be relative or absolute, return false on success. - String get_current_dir(bool p_include_drive = true); // Return current dir location. + String get_current_dir(); // Return current dir location. Error make_dir(String p_dir); Error make_dir_recursive(String p_dir); diff --git a/doc/classes/Directory.xml b/doc/classes/Directory.xml index cb59a69876..ed4257a809 100644 --- a/doc/classes/Directory.xml +++ b/doc/classes/Directory.xml @@ -77,11 +77,8 @@ <method name="get_current_dir"> <return type="String"> </return> - <argument index="0" name="include_drive" type="bool" default="true"> - </argument> <description> Returns the absolute path to the currently opened directory (e.g. [code]res://folder[/code] or [code]C:\tmp\folder[/code]). - On Windows, if [code]include_drive[/code] is [code]false[/code], the leading drive specificator is omitted from the returned value (e.g. [code]\tmp\folder[/code]). </description> </method> <method name="get_current_drive"> |