summaryrefslogtreecommitdiffstats
path: root/scene/resources/scene_format_text.cpp
diff options
context:
space:
mode:
authorTwistedTwigleg <beard.noah@gmail.com>2017-08-11 15:10:05 -0400
committerRémi Verschelde <rverschelde@gmail.com>2017-08-16 17:22:23 +0200
commit00f6c859282bb4dab3f6b4f6c20c44222221ebe9 (patch)
treeab3d2bae1ce8e9661480535a6442c94e5aeafd83 /scene/resources/scene_format_text.cpp
parentb1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef (diff)
downloadredot-engine-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.gz
Synchronize parameter names in definition and declaration
Fixes #10244.
Diffstat (limited to 'scene/resources/scene_format_text.cpp')
-rw-r--r--scene/resources/scene_format_text.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 03a862b744..49cd030a9a 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -621,9 +621,9 @@ ResourceInteractiveLoaderText::~ResourceInteractiveLoaderText() {
memdelete(f);
}
-void ResourceInteractiveLoaderText::get_dependencies(FileAccess *f, List<String> *p_dependencies, bool p_add_types) {
+void ResourceInteractiveLoaderText::get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types) {
- open(f);
+ open(p_f);
ignore_resource_parsing = true;
ERR_FAIL_COND(error != OK);